astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-11-02 05:42:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

test: follow recovery regression lint conventions

Browse Source 
Signed-off-by: Feng Ruohang <rh@vonng.com>
This commit is contained in:
Feng Ruohang
2026-10-25 15:59:45 +08:00
parent f54c04846e
commit b15aa97c94
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/erasure-server-pool-recovery_test.go
+6 -3
View File
@@ -117,12 +117,14 @@ func (d recoveryReadFaultDisk) ReadXL(ctx context.Context, bucket, object string
} }
return d.StorageAPI.ReadXL(ctx, bucket, object, data) return d.StorageAPI.ReadXL(ctx, bucket, object, data)
} }
func (d recoveryReadFaultDisk) ReadVersion(ctx context.Context, orig, bucket, object, version string, opts ReadOptions) (FileInfo, error) { func (d recoveryReadFaultDisk) ReadVersion(ctx context.Context, orig, bucket, object, version string, opts ReadOptions) (FileInfo, error) {
if bucket == d.bucket && object == d.object && d.fail.Load() { if bucket == d.bucket && object == d.object && d.fail.Load() {
return FileInfo{}, errDiskNotFound return FileInfo{}, errDiskNotFound
} }
return d.StorageAPI.ReadVersion(ctx, orig, bucket, object, version, opts) return d.StorageAPI.ReadVersion(ctx, orig, bucket, object, version, opts)
} }
func (d recoveryReadFaultDisk) RenameData(ctx context.Context, sv, sp string, fi FileInfo, dv, dp string, opts RenameOptions) (RenameDataResp, error) { func (d recoveryReadFaultDisk) RenameData(ctx context.Context, sv, sp string, fi FileInfo, dv, dp string, opts RenameOptions) (RenameDataResp, error) {
res, err := d.StorageAPI.RenameData(ctx, sv, sp, fi, dv, dp, opts) res, err := d.StorageAPI.RenameData(ctx, sv, sp, fi, dv, dp, opts)
if err == nil && d.afterRename && dv == d.bucket && dp == d.object { if err == nil && d.afterRename && dv == d.bucket && dp == d.object {
@@ -216,20 +218,21 @@ func TestPoolsRecoveryRefusesUnresolvedPools(t *testing.T) {
if result.Code != http.StatusServiceUnavailable { if result.Code != http.StatusServiceUnavailable {
t.Errorf("unresolved recovery returned HTTP=%d: %s", result.Code, result.Body.String()) t.Errorf("unresolved recovery returned HTTP=%d: %s", result.Code, result.Body.String())
} }
if !postCommitFailure { switch {
case !postCommitFailure:
after := snapshot() after := snapshot()
for i := range before { for i := range before {
if before[i] != after[i] { if before[i] != after[i] {
t.Errorf("refused preflight modified shard %d", i) t.Errorf("refused preflight modified shard %d", i)
} }
} }
} else if mode == "read-fails-after-commit" { case mode == "read-fails-after-commit":
fail.Store(false) fail.Store(false)
got := consistencyRequest(t, router, http.MethodGet, bucket, object, "") got := consistencyRequest(t, router, http.MethodGet, bucket, object, "")
if got.Code != http.StatusOK || !bytes.Equal(got.Body.Bytes(), replacement) { if got.Code != http.StatusOK || !bytes.Equal(got.Body.Bytes(), replacement) {
t.Errorf("read validation failure must not undo committed recovery: HTTP=%d", got.Code) t.Errorf("read validation failure must not undo committed recovery: HTTP=%d", got.Code)
} }
} else { default:
// A readable but different latest copy cannot confirm recovery. // A readable but different latest copy cannot confirm recovery.
// The committed replacement must still remain in its target pool. // The committed replacement must still remain in its target pool.
r, err := z.serverPools[0].GetObjectNInfo(t.Context(), bucket, object, nil, nil, ObjectOptions{}) r, err := z.serverPools[0].GetObjectNInfo(t.Context(), bucket, object, nil, nil, ObjectOptions{})