From 4669da6074c30eac76332770fc25168f501dfdf4 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 15 Apr 2016 11:45:03 +0100
Subject: [PATCH] Disable persistence of peer lists

---
 router/network_router.go        | 10 ++++++----
 test/370_persist_ipam_2_test.sh |  7 +++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/router/network_router.go b/router/network_router.go
index 5bfbb867..48f6334f 100644
--- a/router/network_router.go
+++ b/router/network_router.go
@@ -211,10 +211,11 @@ func (router *NetworkRouter) relayBroadcast(srcPeer *mesh.Peer, key PacketKey) F
 const peersIdent = "directPeers"
 
 func (router *NetworkRouter) persistPeers() {
-	if err := router.db.Save(peersIdent, router.ConnectionMaker.Targets(false)); err != nil {
+	// Persistence disabled pending rationalisation of the expected behaviour
+	/*if err := router.db.Save(peersIdent, router.ConnectionMaker.Targets(false)); err != nil {
 		log.Errorf("Error persisting peers: %s", err)
 		return
-	}
+	}*/
 }
 
 func (router *NetworkRouter) InitiateConnections(peers []string, replace bool) []error {
@@ -230,9 +231,10 @@ func (router *NetworkRouter) ForgetConnections(peers []string) {
 
 func (router *NetworkRouter) InitialPeers(peers []string) ([]string, error) {
 	var storedPeers []string
-	if _, err := router.db.Load(peersIdent, &storedPeers); err != nil {
+	// Persistence disabled pending rationalisation of the expected behaviour
+	/*if _, err := router.db.Load(peersIdent, &storedPeers); err != nil {
 		return nil, err
-	}
+	}*/
 
 	if storedPeers != nil && !equal(peers, storedPeers) {
 		log.Println("Overriding initial peer list with stored list:", storedPeers)
diff --git a/test/370_persist_ipam_2_test.sh b/test/370_persist_ipam_2_test.sh
index d4bc5ef3..e8d56bb2 100755
--- a/test/370_persist_ipam_2_test.sh
+++ b/test/370_persist_ipam_2_test.sh
@@ -28,7 +28,10 @@ C3=$(container_ip $HOST2 c3)
 assert_raises "[ $C3 != $C1 ]"
 
 # Restart HOST1 and see if it remembers to connect to HOST2
-launch_router_with_db $HOST1
-assert_raises "exec_on $HOST2 c2 $PING $C1"
+#
+# disabled pending rationalisation of the expected behaviour
+#
+# launch_router_with_db $HOST1
+# assert_raises "exec_on $HOST2 c2 $PING $C1"
 
 end_suite