mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-20 03:13:53 +01:00
volume: check the needle id in the streamed-read probe and on blob writes (#12794)
* storage: reject a streamed read whose record id or size differs The header probe before a streamed read returned not-found only when both the record's id and its size differed from the index entry, so a record of another needle with the same size passed and its data was streamed under the requested key until the final checksum check. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * storage: refuse a needle blob whose header names another needle WriteNeedleBlob compared only the blob header's size with the size it was asked to index. A blob read from an offset that has since moved to another record of the same size was appended and indexed under the wrong key. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * volume(rs): refuse a needle blob whose header names another needle Mirror of the Go check: write_needle_blob_and_index compared only the blob header's size, so a blob of another needle with the same size was appended and indexed under the requested key. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * volume(rs): report not-found when a streamed read's record is another needle The meta read ahead of a streamed reply took the id from the record header without comparing it with the requested key. Return not-found when the index entry resolves to another needle, as the Go header probe does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * storage: check the requested id after a meta-only read ReadNeedleMeta overwrites n.Id with the record's header id, so a meta-only read through an index entry that resolves to another needle returned that needle's metadata, and the streamed-read probe that follows compared the record with itself. Return not-found when the header names another needle, as the Rust meta read does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: copy a needle blob to another volume, not under another key WriteNeedleBlob now refuses a blob whose header names another needle, so the round trip writes the blob under its own id into a second volume and checks that storing it under another key is refused. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * storage: compare the streamed header with a deleted entry's record size A deleted index entry stores the negated size, so a read-deleted stream compared the positive header size with a negative one and missed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
4a5dbe4c6f
commit
4ac3633f1c
6 files changed
+209
-26
No files matched your search
@@ -28,7 +28,8 @@ func TestReadWriteNeedleBlobAndMetaRoundTrip(t *testing.T) {
|
||||
const volumeID = uint32(83)
|
||||
const sourceNeedleID = uint64(333333)
|
||||
const sourceCookie = uint32(0xABCD0102)
|
||||
const clonedNeedleID = uint64(333334)
|
||||
const otherNeedleID = uint64(333334)
|
||||
const copyVolumeID = uint32(183)
|
||||
|
||||
framework.AllocateVolume(t, grpcClient, volumeID, "")
|
||||
|
||||
@@ -87,7 +88,24 @@ func TestReadWriteNeedleBlobAndMetaRoundTrip(t *testing.T) {
|
||||
|
||||
_, err = grpcClient.WriteNeedleBlob(ctx, &volume_server_pb.WriteNeedleBlobRequest{
|
||||
VolumeId: volumeID,
|
||||
NeedleId: clonedNeedleID,
|
||||
NeedleId: otherNeedleID,
|
||||
Size: size,
|
||||
NeedleBlob: blobResp.GetNeedleBlob(),
|
||||
})
|
||||
if err == nil || !strings.Contains(err.Error(), "blob header holds needle") {
|
||||
t.Fatalf("WriteNeedleBlob under another needle id should be refused, got %v", err)
|
||||
}
|
||||
if _, err = grpcClient.VolumeNeedleStatus(ctx, &volume_server_pb.VolumeNeedleStatusRequest{
|
||||
VolumeId: volumeID,
|
||||
NeedleId: otherNeedleID,
|
||||
}); err == nil {
|
||||
t.Fatalf("refused blob should not be indexed under needle %d", otherNeedleID)
|
||||
}
|
||||
|
||||
framework.AllocateVolume(t, grpcClient, copyVolumeID, "")
|
||||
_, err = grpcClient.WriteNeedleBlob(ctx, &volume_server_pb.WriteNeedleBlobRequest{
|
||||
VolumeId: copyVolumeID,
|
||||
NeedleId: sourceNeedleID,
|
||||
Size: size,
|
||||
NeedleBlob: blobResp.GetNeedleBlob(),
|
||||
})
|
||||
@@ -95,27 +113,27 @@ func TestReadWriteNeedleBlobAndMetaRoundTrip(t *testing.T) {
|
||||
t.Fatalf("WriteNeedleBlob failed: %v", err)
|
||||
}
|
||||
|
||||
clonedStatus, err := grpcClient.VolumeNeedleStatus(ctx, &volume_server_pb.VolumeNeedleStatusRequest{
|
||||
VolumeId: volumeID,
|
||||
NeedleId: clonedNeedleID,
|
||||
copiedStatus, err := grpcClient.VolumeNeedleStatus(ctx, &volume_server_pb.VolumeNeedleStatusRequest{
|
||||
VolumeId: copyVolumeID,
|
||||
NeedleId: sourceNeedleID,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("VolumeNeedleStatus for cloned needle failed: %v", err)
|
||||
t.Fatalf("VolumeNeedleStatus for copied needle failed: %v", err)
|
||||
}
|
||||
if clonedStatus.GetNeedleId() != sourceNeedleID {
|
||||
t.Fatalf("cloned needle status id mismatch: got %d want %d", clonedStatus.GetNeedleId(), sourceNeedleID)
|
||||
if copiedStatus.GetNeedleId() != sourceNeedleID {
|
||||
t.Fatalf("copied needle status id mismatch: got %d want %d", copiedStatus.GetNeedleId(), sourceNeedleID)
|
||||
}
|
||||
if clonedStatus.GetCookie() != sourceCookie {
|
||||
t.Fatalf("cloned needle cookie mismatch: got %d want %d", clonedStatus.GetCookie(), sourceCookie)
|
||||
if copiedStatus.GetCookie() != sourceCookie {
|
||||
t.Fatalf("copied needle cookie mismatch: got %d want %d", copiedStatus.GetCookie(), sourceCookie)
|
||||
}
|
||||
|
||||
clonedReadResp := framework.ReadBytes(t, client, clusterHarness.VolumeAdminURL(), framework.NewFileID(volumeID, clonedNeedleID, sourceCookie))
|
||||
clonedReadBody := framework.ReadAllAndClose(t, clonedReadResp)
|
||||
if clonedReadResp.StatusCode != 200 {
|
||||
t.Fatalf("cloned needle GET expected 200, got %d", clonedReadResp.StatusCode)
|
||||
copiedReadResp := framework.ReadBytes(t, client, clusterHarness.VolumeAdminURL(), framework.NewFileID(copyVolumeID, sourceNeedleID, sourceCookie))
|
||||
copiedReadBody := framework.ReadAllAndClose(t, copiedReadResp)
|
||||
if copiedReadResp.StatusCode != 200 {
|
||||
t.Fatalf("copied needle GET expected 200, got %d", copiedReadResp.StatusCode)
|
||||
}
|
||||
if string(clonedReadBody) != string(payload) {
|
||||
t.Fatalf("cloned needle body mismatch: got %q want %q", string(clonedReadBody), string(payload))
|
||||
if string(copiedReadBody) != string(payload) {
|
||||
t.Fatalf("copied needle body mismatch: got %q want %q", string(copiedReadBody), string(payload))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user