astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-08-10 00:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(storage): preserve ReadParts errors across keepalive responses

Browse Source 
ReadPartsHandler completed its keepalive stream before reporting storage failures, then tried to write an ordinary error response after the body was already owned. Clients consequently decoded the error text as msgpack and lost the real failure.

Send failures through the keepalive completion channel and mark success only after ReadParts returns cleanly, preserving the existing wire framing and error identity.

Co-authored-by: ChatGPT <noreply@openai.com>
Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Feng Ruohang
2026-08-04 22:42:56 +08:00
parent b6f70ab085
commit 1af351a702
4 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/storage-rest-traversal_test.go
+9 -5
View File
@@ -469,10 +469,14 @@ func TestCheckPartsMalformedErasure(t *testing.T) {
// Deleted short-circuits FileInfo.IsValid() to true, so an IsValid()
// guard would not have caught this one.
{Volume: "foo", Name: "obj", Deleted: true, Parts: []ObjectPartInfo{{Number: 1, Size: 4}}},
{Volume: "foo", Name: "obj", Parts: []ObjectPartInfo{{Number: 1, Size: 4}},
Erasure: ErasureInfo{DataBlocks: 4}}, // BlockSize still zero
{Volume: "foo", Name: "obj", Parts: []ObjectPartInfo{{Number: 1, Size: 4}},
Erasure: ErasureInfo{BlockSize: blockSizeV2}}, // DataBlocks still zero
{
Volume: "foo", Name: "obj", Parts: []ObjectPartInfo{{Number: 1, Size: 4}},
Erasure: ErasureInfo{DataBlocks: 4},
}, // BlockSize still zero
{
Volume: "foo", Name: "obj", Parts: []ObjectPartInfo{{Number: 1, Size: 4}},
Erasure: ErasureInfo{BlockSize: blockSizeV2},
}, // DataBlocks still zero
} {
if _, err := restClient.CheckParts(ctx, "foo", "obj", fi); !errors.Is(err, errFileCorrupt) {
t.Errorf("CheckParts(%+v): got %v, want %v", fi.Erasure, err, errFileCorrupt)
@@ -584,7 +588,7 @@ func TestDeleteVersionsDeclaredCountIsNotTrusted(t *testing.T) {
grew := after.TotalAlloc - before.TotalAlloc
t.Logf("total-versions=%s -> err=%v, allocated %d bytes", total, err, grew)
// 100000000 * sizeof(FileInfoVersions)(104) is ~9.7 GiB; anything in
// that neighbourhood means the declared count is still being trusted.
// that neighborhood means the declared count is still being trusted.
if grew > 64<<20 {
t.Errorf("total-versions=%s allocated %d bytes for an empty body - "+
"the declared count is sizing the allocation", total, grew)