Preserve maintenance timeout behavior and prepare SILO 20261026

Signed-off-by: Feng Ruohang <rh@vonng.com>

internal/ioutil/deadline_test.go

@@ -0,0 +1,62 @@
+// Copyright (c) 2026 Feng Ruohang
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+package ioutil
+
+import (
+	"context"
+	"errors"
+	"strings"
+	"testing"
+	"testing/synctest"
+	"time"
+)
+
+func TestWithDeadlineReturnsBeforeWorker(t *testing.T) {
+	for _, cancelEarly := range []bool{false, true} {
+		synctest.Test(t, func(t *testing.T) {
+			ctx, cancel := context.WithCancel(t.Context())
+			defer cancel()
+			entered, release := make(chan struct{}), make(chan struct{})
+			defer close(release)
+			done := make(chan error, 1)
+			go func() {
+				value, err := WithDeadline(ctx, time.Second, func(context.Context) (int, error) {
+					close(entered)
+					<-release
+					return 42, nil
+				})
+				if value != 0 {
+					t.Errorf("timeout returned a late worker value: %d", value)
+				}
+				done <- err
+			}()
+			<-entered
+			want := context.DeadlineExceeded
+			if cancelEarly {
+				cancel()
+				want = context.Canceled
+			} else {
+				time.Sleep(2 * time.Second)
+			}
+			synctest.Wait()
+			select {
+			case err := <-done:
+				if !errors.Is(err, want) {
+					t.Fatalf("expected %v, got %v", want, err)
+				}
+			default:
+				t.Fatal("caller still waits for the blocked worker")
+			}
+		})
+	}
+}
+
+func TestWithDeadlineContainsPanic(t *testing.T) {
+	value, err := WithDeadline(t.Context(), time.Second, func(context.Context) (int, error) {
+		panic("deadline-test")
+	})
+	if value != 0 || err == nil || !strings.Contains(err.Error(), "deadline-test") {
+		t.Fatalf("panic was not converted to an error: %d, %v", value, err)
+	}
+}

internal/ioutil/ioutil.go

@@ -127,17 +127,6 @@ var deadlineWorkPanics atomic.Int64
 // If the deadline/context passes before the function finishes executing,
 // the zero value and the context error is returned.
 func WithDeadline[V any](ctx context.Context, timeout time.Duration, work func(ctx context.Context) (result V, err error)) (result V, err error) {
-	return withDeadline(ctx, timeout, work, false)
-}
-
-// WithDeadlineAndWait cancels work at the deadline, but waits for it to finish
-// and returns its actual result. Use it for mutations whose caller must not
-// release a lock or start cleanup while the work can still change storage.
-func WithDeadlineAndWait[V any](ctx context.Context, timeout time.Duration, work func(ctx context.Context) (result V, err error)) (result V, err error) {
-	return withDeadline(ctx, timeout, work, true)
-}
-
-func withDeadline[V any](ctx context.Context, timeout time.Duration, work func(ctx context.Context) (result V, err error), wait bool) (result V, err error) {
 	ctx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
 
@@ -174,10 +163,6 @@ func withDeadline[V any](ctx context.Context, timeout time.Duration, work func(c
 	case v := <-c:
 		return v.val, v.err
 	case <-ctx.Done():
-		if wait {
-			v := <-c
-			return v.val, v.err
-		}
 		var zero V
 		return zero, ctx.Err()
 	}

internal/ioutil/ioutil_test.go

@@ -25,62 +25,9 @@ import (
 	"os"
 	"strings"
 	"testing"
-	"testing/synctest"
 	"time"
 )
 
-func TestWithDeadlineAndWait(t *testing.T) {
-	for _, deadline := range []bool{false, true} {
-		name := "cancel"
-		if deadline {
-			name = "deadline"
-		}
-		t.Run(name, func(t *testing.T) {
-			synctest.Test(t, func(t *testing.T) {
-				ctx, cancel := context.WithCancel(t.Context())
-				defer cancel()
-				entered, release := make(chan struct{}), make(chan struct{})
-				done := make(chan ioret[int], 1)
-				go func() {
-					v, err := WithDeadlineAndWait(ctx, time.Second, func(context.Context) (int, error) {
-						close(entered)
-						<-release
-						return 42, nil
-					})
-					done <- ioret[int]{v, err}
-				}()
-				<-entered
-				if deadline {
-					time.Sleep(2 * time.Second)
-				} else {
-					cancel()
-				}
-				synctest.Wait()
-				select {
-				case r := <-done:
-					t.Fatalf("returned before mutation completed: %+v", r)
-				default:
-				}
-				close(release)
-				synctest.Wait()
-				r := <-done
-				if r.err != nil || r.val != 42 {
-					t.Fatalf("lost actual commit result: %+v", r)
-				}
-			})
-		})
-	}
-}
-
-func TestWithDeadlineAndWaitPanic(t *testing.T) {
-	_, err := WithDeadlineAndWait(t.Context(), time.Second, func(context.Context) (int, error) {
-		panic("mutation failure")
-	})
-	if err == nil || !strings.Contains(err.Error(), "mutation failure") {
-		t.Fatalf("worker panic was not returned: %v", err)
-	}
-}
-
 type sleepWriter struct {
 	timeout time.Duration
 }