flag(eigenda): rename RetriesBeforeFailover -> PutRetries

reviewer correctly pointed out that retrying was more general than only for failovers
Layr-Labs · Oct 29, 2024 · 956372a · 956372a
1 parent 8dbc072
commit 956372a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git a/flags/eigendaflags/cli.go b/flags/eigendaflags/cli.go
@@ -28,7 +28,7 @@ var (
 	EthRPCURLFlagName                    = withFlagPrefix("eth-rpc")
 	SvcManagerAddrFlagName               = withFlagPrefix("svc-manager-addr")
 	// Flags that are proxy specific, and not used by the eigenda-client
-	RetriesBeforeFailoverFlagName = withFlagPrefix("retries-before-failover")
+	PutRetriesFlagName = withFlagPrefix("put-retries")
 )
 
 func withFlagPrefix(s string) string {
@@ -142,10 +142,10 @@ func CLIFlags(envPrefix, category string) []cli.Flag {
 		// Flags that are proxy specific, and not used by the eigenda-client
 		// TODO: should we move this to a more specific category, like EIGENDA_STORE?
 		&cli.UintFlag{
-			Name:     RetriesBeforeFailoverFlagName,
-			Usage:    "Number of times to retry blob dispersal before returning a 503 to the client, signifying that the client should failover to ethda.",
+			Name:     PutRetriesFlagName,
+			Usage:    "Number of times to retry blob dispersals.",
 			Value:    3,
-			EnvVars:  []string{withEnvPrefix(envPrefix, "RETRIES_BEFORE_FAILOVER")},
+			EnvVars:  []string{withEnvPrefix(envPrefix, "PUT_RETRIES")},
 			Category: category,
 		},
 	}

diff --git a/server/config.go b/server/config.go
@@ -19,9 +19,9 @@ import (
 )
 
 type Config struct {
-	EdaClientConfig       clients.EigenDAClientConfig
-	VerifierConfig        verify.Config
-	RetriesBeforeFailover uint
+	EdaClientConfig clients.EigenDAClientConfig
+	VerifierConfig  verify.Config
+	PutRetries      uint
 
 	MemstoreEnabled bool
 	MemstoreConfig  memstore.Config
@@ -40,15 +40,15 @@ type Config struct {
 func ReadConfig(ctx *cli.Context) Config {
 	edaClientConfig := eigendaflags.ReadConfig(ctx)
 	return Config{
-		RedisConfig:           redis.ReadConfig(ctx),
-		S3Config:              s3.ReadConfig(ctx),
-		EdaClientConfig:       edaClientConfig,
-		VerifierConfig:        verify.ReadConfig(ctx, edaClientConfig),
-		RetriesBeforeFailover: ctx.Uint(eigendaflags.RetriesBeforeFailoverFlagName),
-		MemstoreEnabled:       ctx.Bool(memstore.EnabledFlagName),
-		MemstoreConfig:        memstore.ReadConfig(ctx),
-		FallbackTargets:       ctx.StringSlice(flags.FallbackTargetsFlagName),
-		CacheTargets:          ctx.StringSlice(flags.CacheTargetsFlagName),
+		RedisConfig:     redis.ReadConfig(ctx),
+		S3Config:        s3.ReadConfig(ctx),
+		EdaClientConfig: edaClientConfig,
+		VerifierConfig:  verify.ReadConfig(ctx, edaClientConfig),
+		PutRetries:      ctx.Uint(eigendaflags.PutRetriesFlagName),
+		MemstoreEnabled: ctx.Bool(memstore.EnabledFlagName),
+		MemstoreConfig:  memstore.ReadConfig(ctx),
+		FallbackTargets: ctx.StringSlice(flags.FallbackTargetsFlagName),
+		CacheTargets:    ctx.StringSlice(flags.CacheTargetsFlagName),
 	}
 }
 

diff --git a/server/load_store.go b/server/load_store.go
@@ -108,10 +108,10 @@ func LoadStoreManager(ctx context.Context, cfg CLIConfig, log log.Logger, m metr
 			verifier,
 			log,
 			&eigenda.StoreConfig{
-				MaxBlobSizeBytes:      cfg.EigenDAConfig.MemstoreConfig.MaxBlobSizeBytes,
-				EthConfirmationDepth:  cfg.EigenDAConfig.VerifierConfig.EthConfirmationDepth,
-				StatusQueryTimeout:    cfg.EigenDAConfig.EdaClientConfig.StatusQueryTimeout,
-				RetriesBeforeFailover: cfg.EigenDAConfig.RetriesBeforeFailover,
+				MaxBlobSizeBytes:     cfg.EigenDAConfig.MemstoreConfig.MaxBlobSizeBytes,
+				EthConfirmationDepth: cfg.EigenDAConfig.VerifierConfig.EthConfirmationDepth,
+				StatusQueryTimeout:   cfg.EigenDAConfig.EdaClientConfig.StatusQueryTimeout,
+				PutRetries:           cfg.EigenDAConfig.PutRetries,
 			},
 		)
 	}

diff --git a/store/generated_key/eigenda/eigenda.go b/store/generated_key/eigenda/eigenda.go
@@ -26,9 +26,8 @@ type StoreConfig struct {
 	// total duration time that client waits for blob to confirm
 	StatusQueryTimeout time.Duration
 
-	// number of times to retry blob dispersal before returning a 503 to the client
-	// signifying that the client should failover to ethda
-	RetriesBeforeFailover uint
+	// number of times to retry eigenda blob dispersals
+	PutRetries uint
 }
 
 // Store does storage interactions and verifications for blobs with DA.
@@ -110,7 +109,7 @@ func (e Store) Put(ctx context.Context, value []byte) ([]byte, error) {
 		// it to an http 503 to signify to the client (batcher) to failover to ethda
 		// b/c eigenda is temporarily down.
 		retry.LastErrorOnly(true),
-		retry.Attempts(e.cfg.RetriesBeforeFailover),
+		retry.Attempts(e.cfg.PutRetries),
 	)
 	if err != nil {
 		// TODO: we will want to filter for errors here and return a 503 when needed