Merge pull request #33232 from aaronlehmann/vendor-swarmkit-2591ac3

[17.03] Vendor swarmkit 2591ac3

vendor.conf

@@ -101,7 +101,7 @@ github.com/docker/containerd 4ab9917febca54791c5f071a9d1f404867857fcc
 github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4
 
 # cluster
-github.com/docker/swarmkit e68072200ebbba6ce9745b3a3e49fdba3eb71ff8
+github.com/docker/swarmkit 2591ac368b6a8ae1c6f8438874e62f8e4778450c
 github.com/golang/mock bd3c8e81be01eef76d4b503f5e687d2d1354d2d9
 github.com/gogo/protobuf v0.3
 github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a

vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go

@@ -404,13 +404,14 @@ func (d *Dispatcher) markNodeReady(nodeID string, description *api.NodeDescripti
 
 	// Wait until the node update batch happens before unblocking register.
 	d.processUpdatesLock.Lock()
+	defer d.processUpdatesLock.Unlock()
+
 	select {
 	case <-d.ctx.Done():
 		return d.ctx.Err()
 	default:
 	}
 	d.processUpdatesCond.Wait()
-	d.processUpdatesLock.Unlock()
 
 	return nil
 }