Commit 77d35a51 authored by Matthew Slipper's avatar Matthew Slipper Committed by GitHub

op-batcher: Don't log DA post failures on context cancel (#13089)

This was causing flakes.
parent f25db964
......@@ -782,7 +782,11 @@ func (l *BatchSubmitter) publishToAltDAAndL1(txdata txData, queue *txmgr.Queue[t
// So we prefer to mimic the behavior of txmgr and cancel all pending DA/txmgr requests when the batcher is stopped.
comm, err := l.AltDA.SetInput(l.shutdownCtx, txdata.CallData())
if err != nil {
l.Log.Error("Failed to post input to Alt DA", "error", err)
// Don't log context cancelled events because they are expected,
// and can happen after tests complete which causes a panic.
if !errors.Is(err, context.Canceled) {
l.Log.Error("Failed to post input to Alt DA", "error", err)
}
// requeue frame if we fail to post to the DA Provider so it can be retried
// note: this assumes that the da server caches requests, otherwise it might lead to resubmissions of the blobs
l.recordFailedDARequest(txdata.ID(), err)
......
......@@ -34,7 +34,9 @@ func TestBatcherConcurrentAltDARequests(t *testing.T) {
cfg.DisableBatcher = true
sys, err := cfg.Start(t)
require.NoError(t, err, "Error starting up system")
defer sys.Close()
t.Cleanup(func() {
sys.Close()
})
// make every request take 5 seconds, such that only concurrent requests will be able to make progress fast enough
sys.FakeAltDAServer.SetPutRequestLatency(5 * time.Second)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment