Prevent raftable from skipping peers during retries.

knizhnik · knizhnik · commit c26f6e4e0954 · 2016-07-05T18:11:36.000+03:00
diff --git a/contrib/raftable/raftable.c b/contrib/raftable/raftable.c
@@ -46,6 +46,7 @@ static struct {
 	int *leader;
 } shared;
 
+static bool try_next_leader = true;
 static int leadersock = -1;
 static WorkerConfig wcfg;
 static char *peerstr;
@@ -78,8 +79,8 @@ static void disconnect_leader(void)
 	if (leadersock >= 0)
 	{
 		close(leadersock);
+		try_next_leader = true;
 	}
-	select_next_peer();
 	leadersock = -1;
 }
 
@@ -172,7 +173,8 @@ static bool connect_leader(timeout_t *timeout)
 
 	HostPort *leaderhp;
 
-	if (*shared.leader == NOBODY) select_next_peer();
+//	if (*shared.leader == NOBODY) select_next_peer();
+	if (try_next_leader) select_next_peer();
 
 	leaderhp = wcfg.peers + *shared.leader;
 
