Refactor election timeout and remove bootstrap logic

Author: bootjp

adapter/test_util.go

@@ -57,7 +57,7 @@ const (
 	redisPort = 63790
 
 	// followers wait longer before starting elections to give the leader time to bootstrap and share config.
-	followerElectionTimeout = 30 * time.Second
+	followerElectionTimeout = 10 * time.Second
 )
 
 var mu sync.Mutex
@@ -125,32 +125,13 @@ func createNode(t *testing.T, n int) ([]Node, []string, []string) {
 	cfg := buildRaftConfig(n, ports)
 	nodes, grpcAdders, redisAdders := setupNodes(t, ctx, n, ports, cfg)
 
-	bootstrapFollowers(t, cfg, nodes)
 	waitForNodeListeners(t, ctx, nodes, waitTimeout, waitInterval)
 	waitForConfigReplication(t, cfg, nodes, waitTimeout, waitInterval)
 	waitForRaftReadiness(t, nodes, waitTimeout, waitInterval)
 
 	return nodes, grpcAdders, redisAdders
 }
 
-func bootstrapFollowers(t *testing.T, cfg raft.Configuration, nodes []Node) {
-	t.Helper()
-	for i, n := range nodes {
-		if i == 0 {
-			continue
-		}
-
-		future := n.raft.GetConfiguration()
-		assert.NoError(t, future.Error())
-		if len(future.Configuration().Servers) != 0 {
-			continue
-		}
-
-		boot := n.raft.BootstrapCluster(cfg)
-		assert.NoError(t, boot.Error())
-	}
-}
-
 func waitForNodeListeners(t *testing.T, ctx context.Context, nodes []Node, waitTimeout, waitInterval time.Duration) {
 	t.Helper()
 	d := &net.Dialer{Timeout: time.Second}
@@ -255,7 +236,7 @@ func buildRaftConfig(n int, ports []portsAdress) raft.Configuration {
 	return cfg
 }
 
-const leaderElectionTimeout = 10 * time.Second
+const leaderElectionTimeout = 0 * time.Second
 
 func setupNodes(t *testing.T, ctx context.Context, n int, ports []portsAdress, cfg raft.Configuration) ([]Node, []string, []string) {
 	t.Helper()

cmd/server/demo.go

@@ -6,7 +6,6 @@ import (
 	"net"
 	"os"
 	"strconv"
-	"time"
 
 	"github.com/Jille/raft-grpc-leader-rpc/leaderhealth"
 	transport "github.com/Jille/raft-grpc-transport"
@@ -81,7 +80,7 @@ func run(eg *errgroup.Group) error {
 		trxSt := store.NewMemoryStoreDefaultTTL()
 		fsm := kv.NewKvFSM(st, trxSt)
 
-		r, tm, err := newRaft(strconv.Itoa(i), grpcAdders[i], fsm, i == 0, cfg, 0)
+		r, tm, err := newRaft(strconv.Itoa(i), grpcAdders[i], fsm, i == 0, cfg)
 		if err != nil {
 			return errors.WithStack(err)
 		}
@@ -120,14 +119,10 @@ func run(eg *errgroup.Group) error {
 	return nil
 }
 
-func newRaft(myID string, myAddress string, fsm raft.FSM, bootstrap bool, cfg raft.Configuration, electionTimeout time.Duration) (*raft.Raft, *transport.Manager, error) {
+func newRaft(myID string, myAddress string, fsm raft.FSM, bootstrap bool, cfg raft.Configuration) (*raft.Raft, *transport.Manager, error) {
 	c := raft.DefaultConfig()
 	c.LocalID = raft.ServerID(myID)
 
-	if electionTimeout > 0 {
-		c.ElectionTimeout = electionTimeout
-	}
-
 	// this config is for development
 	ldb := raft.NewInmemStore()
 	sdb := raft.NewInmemStore()