From ee3e7ea716e61e0d4e8e19e39f90f683ab70c2d2 Mon Sep 17 00:00:00 2001 From: Feng Ruohang Date: Sun, 25 Oct 2026 18:40:40 +0800 Subject: [PATCH] test: keep deferred read diagnostic helpers with their build tag Signed-off-by: Feng Ruohang --- cmd/object-mutation-consistency_test.go | 19 ------------------- cmd/object-mutation-read-strict_test.go | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/cmd/object-mutation-consistency_test.go b/cmd/object-mutation-consistency_test.go index b624965a1..5ab971c87 100644 --- a/cmd/object-mutation-consistency_test.go +++ b/cmd/object-mutation-consistency_test.go @@ -605,25 +605,6 @@ func TestMutationCanceledSuccessfulCommitIsNotUndone(t *testing.T) { } } -type orderedRenameDisk struct { - StorageAPI - early bool - earlyDone chan<- struct{} - release <-chan struct{} -} - -func (d orderedRenameDisk) RenameData(ctx context.Context, sv, sp string, fi FileInfo, dv, dp string, opts RenameOptions) (RenameDataResp, error) { - if !d.early { - <-d.release - } - r, err := d.StorageAPI.RenameData(ctx, sv, sp, fi, dv, dp, opts) - if d.early { - d.earlyDone <- struct{}{} - <-d.release - } - return r, err -} - // Partial no-op updates may revoke undo on only some disks. That internal // capability must not split the quorum of otherwise identical object contents. func TestMutationPartialNoopPreservesReadability(t *testing.T) { diff --git a/cmd/object-mutation-read-strict_test.go b/cmd/object-mutation-read-strict_test.go index df47e4f72..efc56728b 100644 --- a/cmd/object-mutation-read-strict_test.go +++ b/cmd/object-mutation-read-strict_test.go @@ -9,6 +9,7 @@ package cmd import ( + "context" xhttp "github.com/minio/minio/internal/http" "io" "strconv" @@ -196,3 +197,22 @@ func uniformLatestVersion(meta []FileInfo, errs []error) bool { } return true } + +type orderedRenameDisk struct { + StorageAPI + early bool + earlyDone chan<- struct{} + release <-chan struct{} +} + +func (d orderedRenameDisk) RenameData(ctx context.Context, sv, sp string, fi FileInfo, dv, dp string, opts RenameOptions) (RenameDataResp, error) { + if !d.early { + <-d.release + } + r, err := d.StorageAPI.RenameData(ctx, sv, sp, fi, dv, dp, opts) + if d.early { + d.earlyDone <- struct{}{} + <-d.release + } + return r, err +}