Improve experiment configuration

Author: julienrbrt

pkg/config/config.go

@@ -343,38 +343,6 @@ func (d *DAConfig) IsFiberEnabled() bool {
 	return d.Fiber.Enabled
 }
 
-// ApplyFiberDefaults flips the DA client to Fiber-friendly defaults
-// when the Fiber profile is enabled — adaptive batching, a 1 s
-// DA.BlockTime so inclusion-tracking keeps pace with Fibre's
-// settlement, and a bounded pending-cache window so a Fibre stall
-// can't grow memory unbounded. Caller-provided non-zero values for
-// the tunables (BatchSizeThreshold, BatchMinItems) are preserved.
-//
-// Intended to be invoked once at runner startup, after parsing the
-// usual config but before constructing the DA client.
-func (c *Config) ApplyFiberDefaults() {
-	if !c.DA.IsFiberEnabled() {
-		return
-	}
-
-	c.DA.BatchingStrategy = "adaptive"
-	if c.DA.BatchSizeThreshold <= 0 || c.DA.BatchSizeThreshold > 1 {
-		c.DA.BatchSizeThreshold = 0.5
-	}
-	c.DA.BatchMaxDelay = DurationWrapper{Duration: 8 * time.Second}
-	if c.DA.BatchMinItems == 0 {
-		c.DA.BatchMinItems = 1
-	}
-
-	c.DA.BlockTime = DurationWrapper{Duration: 1 * time.Second}
-	// Tighter pending cap (was 50). At 50, a Fibre upload stall lets the
-	// submitter accumulate 50 × ~32 MiB blob copies + their per-validator
-	// retry buffers; under load that exceeded c6in.8xlarge's 64 GiB and
-	// OOM-killed evnode at 63.8 GiB. 10 keeps the in-flight footprint
-	// bounded while still letting healthy uploads pipeline.
-	c.Node.MaxPendingHeadersAndData = 10
-}
-
 // GetNamespace returns the namespace for header submissions.
 func (d *DAConfig) GetNamespace() string {
 	return d.Namespace

tools/celestia-node-fiber/cmd/evnode-fibre/main.go

@@ -299,9 +299,11 @@ func run(cli cliFlags) error {
 	cfg.DA.Fiber.KeyringPath = cli.keyringPath
 	cfg.DA.Fiber.KeyName = cli.keyName
 	cfg.DA.RequestTimeout = config.DurationWrapper{Duration: 60 * time.Second}
-	// Fiber-tuned profile: BatchingStrategy=adaptive, BatchMaxDelay=1.5s,
-	// DA.BlockTime=1s, MaxPendingHeadersAndData=0, plus 120 MiB blob cap.
-	cfg.ApplyFiberDefaults()
+	// cfg.DA.BatchMaxDelay = config.DurationWrapper{Duration: 8 * time.Second}
+	cfg.DA.BatchMinItems = 1
+	cfg.DA.BatchingStrategy = "size"
+	cfg.DA.BatchSizeThreshold = 0.95
+	cfg.Node.MaxPendingHeadersAndData = 10_000
 	// 100 MiB — bounded by Fibre's hard ~128 MiB per-upload cap (we
 	// hit `data size exceeds maximum 134217723` at 128 MiB - 5 B).
 	// Set the per-block data cap below that so each block_data item