docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2184 from realityone/fix-reschedule-docs 

fix set reschedule policy docs
This commit is contained in:
Dongluo Chen 2016-05-11 14:02:04 -07:00
parent 922472ae58 fb28924a69
commit 45d2960226
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/config.go
View File

@ -90,7 +90,7 @@ func BuildContainerConfig(c container.Config, h container.HostConfig, n network.
json.Unmarshal([]byte(labels), &constraints) json.Unmarshal([]byte(labels), &constraints)
} }
// parse reschedule policy from labels (ex. docker run --label 'com.docker.swarm.reschedule-policies=on-node-failure') // parse reschedule policy from labels (ex. docker run --label 'com.docker.swarm.reschedule-policies=["on-node-failure"]')
if labels, ok := c.Labels[SwarmLabelNamespace+".reschedule-policies"]; ok { if labels, ok := c.Labels[SwarmLabelNamespace+".reschedule-policies"]; ok {
json.Unmarshal([]byte(labels), &reschedulePolicies) json.Unmarshal([]byte(labels), &reschedulePolicies)
} }

6
docs/scheduler/rescheduling.md
View File

@ -19,7 +19,7 @@ running on fail.
You set the reschedule policy when you start a container. You can do this with You set the reschedule policy when you start a container. You can do this with
the `reschedule` environment variable or the the `reschedule` environment variable or the
`com.docker.swarm.reschedule-policy` label. If you don't specify a policy, the `com.docker.swarm.reschedule-policies` label. If you don't specify a policy, the
default rescheduling policy is `off` which means that Swarm does not restart a default rescheduling policy is `off` which means that Swarm does not restart a
container when a node fails. container when a node fails.
@ -29,10 +29,10 @@ To set the `on-node-failure` policy with a `reschedule` environment variable:
$ docker run -d -e reschedule:on-node-failure redis $ docker run -d -e reschedule:on-node-failure redis
``` ```
To set the same policy with a `com.docker.swarm.reschedule-policy` label: To set the same policy with a `com.docker.swarm.reschedule-policies` label:
```bash ```bash
$ docker run -d -l 'com.docker.swarm.reschedule-policy=["on-node-failure"]' redis $ docker run -d -l 'com.docker.swarm.reschedule-policies=["on-node-failure"]' redis
``` ```
## Review reschedule logs ## Review reschedule logs