Browse code

Merge pull request #23015 from mavenugo/v1.11.2-ln

Bumping libnetwork to v0.7.2-rc1

Brian Goff authored on 2016/05/27 23:50:49
Showing 3 changed files
... ...
@@ -30,7 +30,7 @@ clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837
30 30
 clone git github.com/imdario/mergo 0.2.1
31 31
 
32 32
 #get libnetwork packages
33
-clone git github.com/docker/libnetwork v0.7.0-rc.7
33
+clone git github.com/docker/libnetwork v0.7.2-rc.1
34 34
 clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
35 35
 clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b
36 36
 clone git github.com/hashicorp/memberlist 9a1e242e454d2443df330bdd51a436d5a9058fc4
... ...
@@ -1,5 +1,8 @@
1 1
 # Changelog
2 2
 
3
+## 0.7.2-rc.1 (2016-05-07)
4
+- Fixed a stale endpoint issue on overlay networks during ungraceful restart
5
+
3 6
 ## 0.7.0-rc.7 (2016-04-22)
4 7
 - Fixes https://github.com/docker/libnetwork/issues/1113
5 8
 - Fixes https://github.com/docker/libnetwork/issues/1069
... ...
@@ -213,7 +213,7 @@ func (c *controller) sandboxCleanup() {
213 213
 			var ep *endpoint
214 214
 			if err != nil {
215 215
 				logrus.Errorf("getNetworkFromStore for nid %s failed while trying to build sandbox for cleanup: %v", eps.Nid, err)
216
-				n = &network{id: eps.Nid, ctrlr: c, drvOnce: &sync.Once{}}
216
+				n = &network{id: eps.Nid, ctrlr: c, drvOnce: &sync.Once{}, persist: true}
217 217
 				ep = &endpoint{id: eps.Eid, network: n, sandboxID: sbs.ID}
218 218
 			} else {
219 219
 				ep, err = n.getEndpointFromStore(eps.Eid)