浏览代码

Merge pull request #30007 from aaronlehmann/vendor-swarmkit-8ea08a3

[1.13] Update vendored swarmkit to 8ea08a3
Victor Vieux 8 年之前
父节点
当前提交
3fc150171f
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 1 1
      vendor.conf
  2. 1 3
      vendor/github.com/docker/swarmkit/manager/state/raft/raft.go

+ 1 - 1
vendor.conf

@@ -100,7 +100,7 @@ github.com/docker/containerd 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
 github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4
 
 # cluster
-github.com/docker/swarmkit 7f910df8587ad86b62be7a023a2236183e68d879
+github.com/docker/swarmkit 8ea08a3c9372c8b5db722d9d857a568a8c5abb20
 github.com/golang/mock bd3c8e81be01eef76d4b503f5e687d2d1354d2d9
 github.com/gogo/protobuf v0.3
 github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a

+ 1 - 3
vendor/github.com/docker/swarmkit/manager/state/raft/raft.go

@@ -505,9 +505,7 @@ func (n *Node) Run(ctx context.Context) error {
 					n.campaignWhenAble = false
 				}
 				if len(members) == 1 && members[n.Config.ID] != nil {
-					if err := n.raftNode.Campaign(ctx); err != nil {
-						panic("raft: cannot campaign to be the leader on node restore")
-					}
+					n.raftNode.Campaign(ctx)
 				}
 			}