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

Merge pull request #1258 from abronan/change_replication_ttl_flag 

Replace --leaderTTL flag by --replication-ttl
This commit is contained in:
Victor Vieux 2015-10-06 14:09:15 -07:00
parent 15fbd17b7e c74cf900ef
commit 94d2375919
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/flags.go
View File

@ -118,7 +118,7 @@ var (
Usage: "Enable Swarm manager replication", Usage: "Enable Swarm manager replication",
} }
flLeaderTTL = cli.StringFlag{ flLeaderTTL = cli.StringFlag{
Name: "leaderTTL", Name: "replication-ttl",
Value: "30s", Value: "30s",
Usage: "Leader lock release time on failure", Usage: "Leader lock release time on failure",
} }

4
cli/manage.go
View File

@ -268,9 +268,9 @@ func manage(c *cli.Context) {
if !checkAddrFormat(addr) { if !checkAddrFormat(addr) {
log.Fatal("--advertise should be of the form ip:port or hostname:port") log.Fatal("--advertise should be of the form ip:port or hostname:port")
} }
leaderTTL, err := time.ParseDuration(c.String("leaderTTL")) leaderTTL, err := time.ParseDuration(c.String("replication-ttl"))
if err != nil { if err != nil {
log.Fatalf("invalid --leaderTTL: %v", err) log.Fatalf("invalid --replication-ttl: %v", err)
} }
setupReplication(c, cl, server, discovery, addr, leaderTTL, tlsConfig) setupReplication(c, cl, server, discovery, addr, leaderTTL, tlsConfig)

12
test/integration/replication.bats
View File

@ -38,12 +38,12 @@ function teardown() {
local host=127.0.0.1:$port local host=127.0.0.1:$port
# Bring up one manager, make sure it becomes primary. # Bring up one manager, make sure it becomes primary.
swarm_manage --replication --leaderTTL "4s" --advertise 127.0.0.1:$SWARM_BASE_PORT "$DISCOVERY" swarm_manage --replication --replication-ttl "4s" --advertise 127.0.0.1:$SWARM_BASE_PORT "$DISCOVERY"
run docker -H ${SWARM_HOSTS[0]} info run docker -H ${SWARM_HOSTS[0]} info
[[ "${output}" == *"Role: primary"* ]] [[ "${output}" == *"Role: primary"* ]]
# Fire up a second manager. Ensure it's a replica forwarding to the right primary. # Fire up a second manager. Ensure it's a replica forwarding to the right primary.
swarm_manage --replication --leaderTTL "4s" --advertise 127.0.0.1:$(($SWARM_BASE_PORT + 1)) "$DISCOVERY" swarm_manage --replication --replication-ttl "4s" --advertise 127.0.0.1:$(($SWARM_BASE_PORT + 1)) "$DISCOVERY"
run docker -H ${SWARM_HOSTS[1]} info run docker -H ${SWARM_HOSTS[1]} info
[[ "${output}" == *"Role: replica"* ]] [[ "${output}" == *"Role: replica"* ]]
[[ "${output}" == *"Primary: ${SWARM_HOSTS[0]}"* ]] [[ "${output}" == *"Primary: ${SWARM_HOSTS[0]}"* ]]
@ -53,7 +53,7 @@ function teardown() {
retry 20 1 eval "docker -H ${SWARM_HOSTS[1]} info | grep -q 'Role: primary'" retry 20 1 eval "docker -H ${SWARM_HOSTS[1]} info | grep -q 'Role: primary'"
# Add a new replica and make sure it sees the new leader as primary. # Add a new replica and make sure it sees the new leader as primary.
swarm_manage --replication --advertise 127.0.0.1:$(($SWARM_BASE_PORT + 2)) "$DISCOVERY" swarm_manage --replication --replication-ttl "4s" --advertise 127.0.0.1:$(($SWARM_BASE_PORT + 2)) "$DISCOVERY"
run docker -H ${SWARM_HOSTS[2]} info run docker -H ${SWARM_HOSTS[2]} info
[[ "${output}" == *"Role: replica"* ]] [[ "${output}" == *"Role: replica"* ]]
[[ "${output}" == *"Primary: ${SWARM_HOSTS[1]}"* ]] [[ "${output}" == *"Primary: ${SWARM_HOSTS[1]}"* ]]
@ -61,18 +61,18 @@ function teardown() {
@test "leader election - store failure" { @test "leader election - store failure" {
# Bring up one manager, make sure it becomes primary. # Bring up one manager, make sure it becomes primary.
swarm_manage --replication --leaderTTL "4s" --advertise 127.0.0.1:$SWARM_BASE_PORT "$DISCOVERY" swarm_manage --replication --replication-ttl "4s" --advertise 127.0.0.1:$SWARM_BASE_PORT "$DISCOVERY"
run docker -H ${SWARM_HOSTS[0]} info run docker -H ${SWARM_HOSTS[0]} info
[[ "${output}" == *"Role: primary"* ]] [[ "${output}" == *"Role: primary"* ]]
# Fire up a second manager. Ensure it's a replica forwarding to the right primary. # Fire up a second manager. Ensure it's a replica forwarding to the right primary.
swarm_manage --replication --leaderTTL "4s" --advertise 127.0.0.1:$(($SWARM_BASE_PORT + 1)) "$DISCOVERY" swarm_manage --replication --replication-ttl "4s" --advertise 127.0.0.1:$(($SWARM_BASE_PORT + 1)) "$DISCOVERY"
run docker -H ${SWARM_HOSTS[1]} info run docker -H ${SWARM_HOSTS[1]} info
[[ "${output}" == *"Role: replica"* ]] [[ "${output}" == *"Role: replica"* ]]
[[ "${output}" == *"Primary: ${SWARM_HOSTS[0]}"* ]] [[ "${output}" == *"Primary: ${SWARM_HOSTS[0]}"* ]]
# Fire up a third manager. Ensure it's a replica forwarding to the right primary. # Fire up a third manager. Ensure it's a replica forwarding to the right primary.
swarm_manage --replication --leaderTTL "4s" --advertise 127.0.0.1:$(($SWARM_BASE_PORT + 2)) "$DISCOVERY" swarm_manage --replication --replication-ttl "4s" --advertise 127.0.0.1:$(($SWARM_BASE_PORT + 2)) "$DISCOVERY"
run docker -H ${SWARM_HOSTS[2]} info run docker -H ${SWARM_HOSTS[2]} info
[[ "${output}" == *"Role: replica"* ]] [[ "${output}" == *"Role: replica"* ]]
[[ "${output}" == *"Primary: ${SWARM_HOSTS[0]}"* ]] [[ "${output}" == *"Primary: ${SWARM_HOSTS[0]}"* ]]