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

Make `--dispatcher-heartbeat-period` a duration 

Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
This commit is contained in:
Arnaud Porterie (icecrime) 2016-06-14 17:36:37 -07:00
parent 93daa10e3e
commit e6e1fd5d06
No known key found for this signature in database
GPG Key ID: 3D78FAF1AF91D9E9
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/client/swarm/update.go
View File

@ -2,6 +2,7 @@ package swarm
import (
"fmt"
"time"
"golang.org/x/net/context"
@ -16,7 +17,7 @@ type updateOptions struct {
autoAccept AutoAcceptOption
secret string
taskHistoryLimit int64
heartbeatPeriod uint64
dispatcherHeartbeat time.Duration
}
func newUpdateCommand(dockerCli *client.DockerCli) *cobra.Command {
@ -36,7 +37,7 @@ func newUpdateCommand(dockerCli *client.DockerCli) *cobra.Command {
flags.Var(&opts.autoAccept, "auto-accept", "Auto acceptance policy (worker, manager or none)")
flags.StringVar(&opts.secret, "secret", "", "Set secret value needed to accept nodes into cluster")
flags.Int64Var(&opts.taskHistoryLimit, "task-history-limit", 10, "Task history retention limit")
flags.Uint64Var(&opts.heartbeatPeriod, "dispatcher-heartbeat-period", 5000000000, "Dispatcher heartbeat period")
flags.DurationVar(&opts.dispatcherHeartbeat, "dispatcher-heartbeat", time.Duration(5*time.Second), "Dispatcher heartbeat period")
return cmd
}
@ -85,8 +86,10 @@ func mergeSwarm(swarm *swarm.Swarm, flags *pflag.FlagSet) error {
spec.Orchestration.TaskHistoryRetentionLimit, _ = flags.GetInt64("task-history-limit")
}
if flags.Changed("dispatcher-heartbeat-period") {
spec.Dispatcher.HeartbeatPeriod, _ = flags.GetUint64("dispatcher-heartbeat-period")
if flags.Changed("dispatcher-heartbeat") {
if v, err := flags.GetDuration("dispatcher-heartbeat"); err == nil {
spec.Dispatcher.HeartbeatPeriod = uint64(v.Nanoseconds())
}
}
return nil

2
contrib/completion/bash/docker
View File

@ -1641,7 +1641,7 @@ _docker_swarm_join() {
_docker_swarm_update() {
case "$cur" in
-*)
COMPREPLY=( $( compgen -W "--auto-accept --dispatcher-heartbeat-period --help --secret --task-history-limit" -- "$cur" ) )
COMPREPLY=( $( compgen -W "--auto-accept --dispatcher-heartbeat --help --secret --task-history-limit" -- "$cur" ) )
;;
esac
}

5
docs/reference/commandline/swarm_update.md
View File

@ -17,10 +17,11 @@ parent = "smn_cli"
update the Swarm.
Options:
--auto-accept value Acceptance policy (default [worker,manager])
--auto-accept value Auto acceptance policy (worker, manager or none)
--dispatcher-heartbeat duration Dispatcher heartbeat period (default 5s)
--help Print usage
--secret string Set secret value needed to accept nodes into cluster
--task-history-limit int Task history retention limit (default 10)
Updates a Swarm cluster with new parameter values. This command must target a manager node.