Merge pull request #156520 from tbg/blathers/backport-release-24.3-156464

tbg · web-flow · commit b6d410b2ffa0 · 2025-11-18T12:04:48.000+01:00
diff --git a/pkg/kv/kvserver/replica_command.go b/pkg/kv/kvserver/replica_command.go
@@ -2361,6 +2361,9 @@ func within10s(ctx context.Context, fn func() error) error {
 			return nil
 		}
 	}
+	if err != nil {
+		return err
+	}
 	return ctx.Err()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2361,6 +2361,9 @@ func within10s(ctx context.Context, fn func() error) error {`
`2361`	`2361`	`return nil`
`2362`	`2362`	`}`
`2363`	`2363`	`}`
	`2364`	`+ if err != nil {`
	`2365`	`+ return err`
	`2366`	`+ }`
`2364`	`2367`	`return ctx.Err()`
`2365`	`2368`	`}`
`2366`	`2369`