Persist the 'owned' address set

ipam/allocator.go

@@ -83,7 +83,7 @@ func NewAllocator(ourName mesh.PeerName, ourUID mesh.PeerUID, ourNickname string
 
 // Start runs the allocator goroutine
 func (alloc *Allocator) Start() {
-	alloc.loadPersistedRing()
+	alloc.loadPersistedData()
 	actionChan := make(chan func(), mesh.ChannelSize)
 	alloc.actionChan = actionChan
 	alloc.ticker = time.NewTicker(tickInterval)
@@ -759,10 +759,11 @@ func (alloc *Allocator) reportFreeSpace() {
 	alloc.ring.ReportFree(freespace)
 }
 
-// Persisting the Ring
+// Persistent data
 const (
-	ringIdent = "ring"
-	nameIdent = "peername"
+	ringIdent  = "ring"
+	nameIdent  = "peername"
+	ownedIdent = "ownedAddresses"
 )
 
 func (alloc *Allocator) persistRing() {
@@ -776,8 +777,8 @@ func (alloc *Allocator) persistRing() {
 	}
 }
 
-func (alloc *Allocator) loadPersistedRing() {
-	var checkPeerName mesh.PeerName
+func (alloc *Allocator) loadPersistedData() {
+	checkPeerName := alloc.ourName
 	if err := alloc.db.Load(nameIdent, &checkPeerName); err != nil {
 		alloc.fatalf("Error loading persisted peer name: %s", err)
 		return
@@ -785,6 +786,7 @@ func (alloc *Allocator) loadPersistedRing() {
 	if checkPeerName != alloc.ourName {
 		alloc.infof("Deleting persisted data for peername %s", checkPeerName)
 		alloc.persistRing()
+		alloc.persistOwned()
 		return
 	}
 	if err := alloc.db.Load(ringIdent, &alloc.ring); err != nil {
@@ -793,6 +795,20 @@ func (alloc *Allocator) loadPersistedRing() {
 	if alloc.ring != nil {
 		alloc.space.UpdateRanges(alloc.ring.OwnedRanges())
 	}
+	if err := alloc.db.Load(ownedIdent, &alloc.owned); err != nil {
+		alloc.fatalf("Error loading persisted address data: %s", err)
+	}
+	for _, addrs := range alloc.owned {
+		for _, addr := range addrs {
+			alloc.space.Claim(addr)
+		}
+	}
+}
+
+func (alloc *Allocator) persistOwned() {
+	if err := alloc.db.Save(ownedIdent, alloc.owned); err != nil {
+		alloc.fatalf("Error persisting address data: %s", err)
+	}
 }
 
 // Owned addresses
@@ -809,11 +825,13 @@ func (alloc *Allocator) hasOwned(ident string) bool {
 // NB: addr must not be owned by ident already
 func (alloc *Allocator) addOwned(ident string, addr address.Address) {
 	alloc.owned[ident] = append(alloc.owned[ident], addr)
+	alloc.persistOwned()
 }
 
 func (alloc *Allocator) removeAllOwned(ident string) []address.Address {
 	a := alloc.owned[ident]
 	delete(alloc.owned, ident)
+	alloc.persistOwned()
 	return a
 }
 
@@ -826,6 +844,7 @@ func (alloc *Allocator) removeOwned(ident string, addrToFree address.Address) bo
 			} else {
 				alloc.owned[ident] = append(addrs[:i], addrs[i+1:]...)
 			}
+			alloc.persistOwned()
 			return true
 		}
 	}

test/163_docker_restart_test.sh

@@ -0,0 +1,49 @@
+#! /bin/bash
+
+. ./config.sh
+
+check_attached() {
+    for c in $@; do
+        assert_raises "exec_on $HOST1 $c $CHECK_ETHWE_UP"
+    done
+}
+
+wait_for_proxy() {
+    for i in $(seq 1 120); do
+        echo "Waiting for proxy to start"
+        if proxy docker_on $1 info > /dev/null 2>&1 ; then
+            return
+        fi
+        sleep 1
+    done
+    echo "Timed out waiting for proxy to start" >&2
+    exit 1
+}
+
+start_suite "Containers get same IP address on restart"
+
+# Remove any persisted data from previous runs
+run_on $HOST1 "sudo rm -f /tmp/test163-*"
+
+WEAVE_DOCKER_ARGS="-v /tmp:/db --restart=always" weave_on $HOST1 launch-router --db-prefix=/db/test163-
+WEAVEPROXY_DOCKER_ARGS=--restart=always weave_on $HOST1 launch-proxy
+
+# Use up first address with throwaway container
+start_container $HOST1 --name=c1
+# Use sigproxy+sleep to create a container that will die when Docker asks it to.
+proxy docker_on $HOST1 run -di --name=c2 --restart=always -dt --entrypoint="/home/weave/sigproxy" weaveworks/weaveexec sleep 600
+C2=$(container_ip $HOST1 c2)
+assert_raises "[ -n $C2 ]"
+check_attached c2
+
+docker_on $HOST1 rm -f c1
+
+# Restart docker daemon, using different commands for systemd- and upstart-managed.
+run_on $HOST1 sh -c "command -v systemctl >/dev/null && sudo systemctl restart docker || sudo service docker restart"
+wait_for_proxy $HOST1
+sleep 3 # allow for re-tries of attach
+check_attached c2
+# Check same IP address was retained
+assert "container_ip $HOST1 c2" "$C2"
+
+end_suite