Browse code

Vendor swarmkit 2591ac3

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>

Aaron Lehmann authored on 2017/05/17 04:06:06
Showing 2 changed files
... ...
@@ -101,7 +101,7 @@ github.com/docker/containerd 4ab9917febca54791c5f071a9d1f404867857fcc
101 101
 github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4
102 102
 
103 103
 # cluster
104
-github.com/docker/swarmkit e68072200ebbba6ce9745b3a3e49fdba3eb71ff8
104
+github.com/docker/swarmkit 2591ac368b6a8ae1c6f8438874e62f8e4778450c
105 105
 github.com/golang/mock bd3c8e81be01eef76d4b503f5e687d2d1354d2d9
106 106
 github.com/gogo/protobuf v0.3
107 107
 github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a
... ...
@@ -404,13 +404,14 @@ func (d *Dispatcher) markNodeReady(nodeID string, description *api.NodeDescripti
404 404
 
405 405
 	// Wait until the node update batch happens before unblocking register.
406 406
 	d.processUpdatesLock.Lock()
407
+	defer d.processUpdatesLock.Unlock()
408
+
407 409
 	select {
408 410
 	case <-d.ctx.Done():
409 411
 		return d.ctx.Err()
410 412
 	default:
411 413
 	}
412 414
 	d.processUpdatesCond.Wait()
413
-	d.processUpdatesLock.Unlock()
414 415
 
415 416
 	return nil
416 417
 }