Merge pull request #170 from ZenGround0/fix/raft-rejoin-errors

Fix/raft rejoin errors

cluster.go

@@ -423,6 +423,9 @@ func (c *Cluster) Shutdown() error {
 		} else {
 			time.Sleep(2 * time.Second)
 		}
+		c.config.unshadow()
+		c.config.Bootstrap = c.peerManager.peersAddrs()
+		c.config.Save("")
 		c.peerManager.resetPeers()
 	}
 

docker/cluster-restart.sh

@@ -1,9 +1,9 @@
 #! /bin/bash
 
 # Restart the cluster process
-sleep 2
+sleep 4
 while true; do
   export CLUSTER_SECRET=""
-  pgrep ipfs-cluster-service || ipfs-cluster-service -f init; echo "CLUSTER RESTARTED"; ipfs-cluster-service --debug &
+  pgrep ipfs-cluster-service || echo "CLUSTER RESTARTING"; ipfs-cluster-service --debug &
   sleep 10
 done

peer_manager.go

@@ -66,6 +66,9 @@ func (pm *peerManager) rmPeer(pid peer.ID, selfShutdown bool) error {
 			go func() {
 				time.Sleep(1 * time.Second)
 				pm.cluster.consensus.Shutdown()
+				pm.cluster.config.unshadow()
+				pm.cluster.config.Bootstrap = pm.peersAddrs()
+				pm.cluster.config.Save("")
 				pm.resetPeers()
 				time.Sleep(4 * time.Second)
 				pm.cluster.Shutdown()