1. docker
  2. Commit 7380935331f0c35315003578258f6c1f47c1a586
Browse code

remove the retries for service update

Signed-off-by: Anda Xu <anda.xu@docker.com>

Anda Xu authored on 2018/04/11 08:54:39
Showing 3 changed files
integration-cli/daemon/daemon_swarm.go
History View file @ 7380935
... ... 
@@ -644,18 +644,3 @@ func (d *Swarm) CheckLeader(c *check.C) (interface{}, check.CommentInterface) {
644 644 
 	}
645 645 
 	return fmt.Errorf("no leader"), check.Commentf("could not find leader")
646 646 
 }
647 
-
648 
-// CmdRetryOutOfSequence tries the specified command against the current daemon for 10 times
649 
-func (d *Swarm) CmdRetryOutOfSequence(args ...string) (string, error) {
650 
-	for i := 0; ; i++ {
651 
-		out, err := d.Cmd(args...)
652 
-		if err != nil {
653 
-			if strings.Contains(out, "update out of sequence") {
654 
-				if i < 10 {
655 
-					continue
656 
-				}
657 
-			}
658 
-		}
659 
-		return out, err
660 
-	}
661 
-}
integration-cli/docker_cli_service_update_test.go
History View file @ 7380935
... ... 
@@ -69,7 +69,7 @@ func (s *DockerSwarmSuite) TestServiceUpdateSecrets(c *check.C) {
69 69 
 	c.Assert(err, checker.IsNil, check.Commentf(out))
70 70
71 71 
 	// add secret
72 
-	out, err = d.CmdRetryOutOfSequence("service", "update", "--detach", "test", "--secret-add", fmt.Sprintf("source=%s,target=%s", testName, testTarget))
72 
+	out, err = d.Cmd("service", "update", "--detach", "test", "--secret-add", fmt.Sprintf("source=%s,target=%s", testName, testTarget))
73 73 
 	c.Assert(err, checker.IsNil, check.Commentf(out))
74 74
75 75 
 	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)
... ... 
@@ -84,7 +84,7 @@ func (s *DockerSwarmSuite) TestServiceUpdateSecrets(c *check.C) {
84 84 
 	c.Assert(refs[0].File.Name, checker.Equals, testTarget)
85 85
86 86 
 	// remove
87 
-	out, err = d.CmdRetryOutOfSequence("service", "update", "--detach", "test", "--secret-rm", testName)
87 
+	out, err = d.Cmd("service", "update", "--detach", "test", "--secret-rm", testName)
88 88 
 	c.Assert(err, checker.IsNil, check.Commentf(out))
89 89
90 90 
 	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)
... ... 
@@ -111,7 +111,7 @@ func (s *DockerSwarmSuite) TestServiceUpdateConfigs(c *check.C) {
111 111 
 	c.Assert(err, checker.IsNil, check.Commentf(out))
112 112
113 113 
 	// add config
114 
-	out, err = d.CmdRetryOutOfSequence("service", "update", "--detach", "test", "--config-add", fmt.Sprintf("source=%s,target=%s", testName, testTarget))
114 
+	out, err = d.Cmd("service", "update", "--detach", "test", "--config-add", fmt.Sprintf("source=%s,target=%s", testName, testTarget))
115 115 
 	c.Assert(err, checker.IsNil, check.Commentf(out))
116 116
117 117 
 	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Configs }}", serviceName)
... ... 
@@ -126,7 +126,7 @@ func (s *DockerSwarmSuite) TestServiceUpdateConfigs(c *check.C) {
126 126 
 	c.Assert(refs[0].File.Name, checker.Equals, testTarget)
127 127
128 128 
 	// remove
129 
-	out, err = d.CmdRetryOutOfSequence("service", "update", "--detach", "test", "--config-rm", testName)
129 
+	out, err = d.Cmd("service", "update", "--detach", "test", "--config-rm", testName)
130 130 
 	c.Assert(err, checker.IsNil, check.Commentf(out))
131 131
132 132 
 	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Configs }}", serviceName)
integration-cli/docker_cli_swarm_test.go
History View file @ 7380935
... ... 
@@ -283,10 +283,10 @@ func (s *DockerSwarmSuite) TestSwarmPublishAdd(c *check.C) {
283 283 
 	out, err = d.Cmd("service", "update", "--detach", "--publish-add", "80:80", name)
284 284 
 	c.Assert(err, checker.IsNil)
285 285
286 
-	out, err = d.CmdRetryOutOfSequence("service", "update", "--detach", "--publish-add", "80:80", name)
286 
+	out, err = d.Cmd("service", "update", "--detach", "--publish-add", "80:80", name)
287 287 
 	c.Assert(err, checker.IsNil)
288 288
289 
-	out, err = d.CmdRetryOutOfSequence("service", "update", "--detach", "--publish-add", "80:80", "--publish-add", "80:20", name)
289 
+	out, err = d.Cmd("service", "update", "--detach", "--publish-add", "80:80", "--publish-add", "80:20", name)
290 290 
 	c.Assert(err, checker.NotNil)
291 291
292 292 
 	out, err = d.Cmd("service", "inspect", "--format", "{{ .Spec.EndpointSpec.Ports }}", name)