Add retry to avoid port in use error (#10062)

op-e2e/sequencer_failover_setup.go

@@ -25,6 +25,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/rollup/driver"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	"github.com/ethereum-optimism/optimism/op-service/retry"
 	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
@@ -37,8 +38,12 @@ const (
 	VerifierName   = "verifier"
 
 	localhost = "127.0.0.1"
+
+	maxSetupRetries = 5
 )
 
+var retryStrategy = &retry.FixedStrategy{Dur: 50 * time.Millisecond}
+
 type conductor struct {
 	service       *con.OpConductor
 	client        conrpc.API
@@ -58,36 +63,10 @@ func setupSequencerFailoverTest(t *testing.T) (*System, map[string]*conductor) {
 	InitParallel(t)
 	ctx := context.Background()
 
-	conductorRpcPorts := map[string]int{
-		Sequencer1Name: findAvailablePort(t),
-		Sequencer2Name: findAvailablePort(t),
-		Sequencer3Name: findAvailablePort(t),
-	}
-
-	// 3 sequencers, 1 verifier, 1 active sequencer.
-	cfg := sequencerFailoverSystemConfig(t, conductorRpcPorts)
-	sys, err := cfg.Start(t)
-	require.NoError(t, err)
-
-	// 3 conductors that connects to 1 sequencer each.
-	conductors := make(map[string]*conductor)
-
-	// initialize all conductors in paused mode
-	conductorCfgs := []struct {
-		name      string
-		port      int
-		bootstrap bool
-	}{
-		{Sequencer1Name, conductorRpcPorts[Sequencer1Name], true}, // one in bootstrap mode so that we can form a cluster.
-		{Sequencer2Name, conductorRpcPorts[Sequencer2Name], false},
-		{Sequencer3Name, conductorRpcPorts[Sequencer3Name], false},
-	}
-	for _, cfg := range conductorCfgs {
-		cfg := cfg
-		nodePRC := sys.RollupNodes[cfg.name].HTTPEndpoint()
-		engineRPC := sys.EthInstances[cfg.name].HTTPEndpoint()
-		conductors[cfg.name] = setupConductor(t, cfg.name, t.TempDir(), nodePRC, engineRPC, cfg.port, cfg.bootstrap, *sys.RollupConfig)
-	}
+	sys, conductors, err := retry.Do2(ctx, maxSetupRetries, retryStrategy, func() (*System, map[string]*conductor, error) {
+		return setupHAInfra(t, ctx)
+	})
+	require.NoError(t, err, "Expected to successfully setup sequencers and conductors after retry")
 
 	// form a cluster
 	c1 := conductors[Sequencer1Name]
@@ -147,15 +126,73 @@ func setupSequencerFailoverTest(t *testing.T) (*System, map[string]*conductor) {
 	return sys, conductors
 }
 
+func setupHAInfra(t *testing.T, ctx context.Context) (*System, map[string]*conductor, error) {
+	startTime := time.Now()
+
+	var sys *System
+	var conductors map[string]*conductor
+	var err error
+
+	// clean up if setup fails due to port in use.
+	defer func() {
+		if err != nil {
+			if sys != nil {
+				sys.Close()
+			}
+
+			for _, c := range conductors {
+				if serr := c.service.Stop(ctx); serr != nil {
+					t.Log("Failed to stop conductor", "error", serr)
+				}
+			}
+		}
+		t.Logf("setupHAInfra took %s\n", time.Since(startTime))
+	}()
+
+	conductorRpcPorts := map[string]int{
+		Sequencer1Name: findAvailablePort(t),
+		Sequencer2Name: findAvailablePort(t),
+		Sequencer3Name: findAvailablePort(t),
+	}
+
+	// 3 sequencers, 1 verifier, 1 active sequencer.
+	cfg := sequencerFailoverSystemConfig(t, conductorRpcPorts)
+	if sys, err = cfg.Start(t); err != nil {
+		return nil, nil, err
+	}
+
+	// 3 conductors that connects to 1 sequencer each.
+	conductors = make(map[string]*conductor)
+
+	// initialize all conductors in paused mode
+	conductorCfgs := []struct {
+		name      string
+		port      int
+		bootstrap bool
+	}{
+		{Sequencer1Name, conductorRpcPorts[Sequencer1Name], true}, // one in bootstrap mode so that we can form a cluster.
+		{Sequencer2Name, conductorRpcPorts[Sequencer2Name], false},
+		{Sequencer3Name, conductorRpcPorts[Sequencer3Name], false},
+	}
+	for _, cfg := range conductorCfgs {
+		cfg := cfg
+		nodePRC := sys.RollupNodes[cfg.name].HTTPEndpoint()
+		engineRPC := sys.EthInstances[cfg.name].HTTPEndpoint()
+		if conductors[cfg.name], err = setupConductor(t, cfg.name, t.TempDir(), nodePRC, engineRPC, cfg.port, cfg.bootstrap, *sys.RollupConfig); err != nil {
+			return nil, nil, err
+		}
+	}
+
+	return sys, conductors, nil
+}
+
 func setupConductor(
 	t *testing.T,
 	serverID, dir, nodeRPC, engineRPC string,
 	rpcPort int,
 	bootstrap bool,
 	rollupCfg rollup.Config,
-) *conductor {
-	// it's unfortunate that it is not possible to pass 0 as consensus port and get back the actual assigned port from raft implementation.
-	// So we find an available port and pass it in to avoid test flakiness (avoid port already in use error).
+) (*conductor, error) {
 	consensusPort := findAvailablePort(t)
 	cfg := con.Config{
 		ConsensusAddr:  localhost,
@@ -189,12 +226,19 @@ func setupConductor(
 
 	ctx := context.Background()
 	service, err := con.New(ctx, &cfg, testlog.Logger(t, log.LevelInfo), "0.0.1")
-	require.NoError(t, err)
+	if err != nil {
+		return nil, err
+	}
+
 	err = service.Start(ctx)
-	require.NoError(t, err)
+	if err != nil {
+		return nil, err
+	}
 
 	rawClient, err := rpc.DialContext(ctx, service.HTTPEndpoint())
-	require.NoError(t, err)
+	if err != nil {
+		return nil, err
+	}
 	client := conrpc.NewAPIClient(rawClient)
 
 	return &conductor{
@@ -202,7 +246,7 @@ func setupConductor(
 		client:        client,
 		consensusPort: consensusPort,
 		rpcPort:       rpcPort,
-	}
+	}, nil
 }
 
 func setupBatcher(t *testing.T, sys *System, conductors map[string]*conductor) {

op-e2e/sequencer_failover_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/ethereum-optimism/optimism/op-conductor/consensus"
+	"github.com/ethereum-optimism/optimism/op-service/retry"
 )
 
 // [Category: Initial Setup]
@@ -95,7 +96,8 @@ func TestSequencerFailover_ConductorRPC(t *testing.T) {
 	// Test AddServerAsNonvoter, do not start a new sequencer just for this purpose, use Sequencer3's rpc to start conductor.
 	// This is fine as this mainly tests conductor's ability to add itself into the raft consensus cluster as a nonvoter.
 	t.Log("Testing AddServerAsNonvoter")
-	nonvoter := setupConductor(
+	nonvoter, err := retry.Do[*conductor](ctx, maxSetupRetries, retryStrategy, func() (*conductor, error) {
+		return setupConductor(
 			t, VerifierName, t.TempDir(),
 			sys.RollupEndpoint(Sequencer3Name),
 			sys.NodeEndpoint(Sequencer3Name),
@@ -103,6 +105,8 @@ func TestSequencerFailover_ConductorRPC(t *testing.T) {
 			false,
 			*sys.RollupConfig,
 		)
+	})
+	require.NoError(t, err)
 
 	err = leader.client.AddServerAsNonvoter(ctx, VerifierName, nonvoter.ConsensusEndpoint())
 	require.NoError(t, err, "Expected leader to add non-voter")