cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix/raft rejoin errors
This commit is contained in:
ZenGround0 2017-10-12 09:54:16 -04:00 committed by GitHub
commit 180807bde0
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster.go
View File

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

4
docker/cluster-restart.sh
View File

@ -1,9 +1,9 @@
#! /bin/bash #! /bin/bash
# Restart the cluster process # Restart the cluster process
sleep 2 sleep 4
while true; do while true; do
export CLUSTER_SECRET="" 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 sleep 10
done done

3
peer_manager.go
View File

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