Skip to content

Fix owners in PDisk can write to other owner's chunks #9869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2024
Merged

Fix owners in PDisk can write to other owner's chunks #9869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2897,7 +2897,16 @@ bool TPDisk::PreprocessRequest(TRequestBase *request) {
}
}
TChunkState &state = ChunkState[ev.ChunkIdx];
if (state.OwnerId == OwnerSystem) {
if (state.OwnerId != ev.Owner) {
err << "Can't write chunkIdx# " << ev.ChunkIdx
<< " chunk is owner by another owner."
<< " chunk's owner# " << state.OwnerId
<< " request's owner# " << ev.Owner;
SendChunkWriteError(ev, err.Str(), NKikimrProto::ERROR);
delete request;
return false;
}
if (!IsOwnerUser(state.OwnerId)) {
err << "Can't write chunkIdx# " << ev.ChunkIdx
<< " destination chunk is owned by the system! ownerId# " << ev.Owner;
SendChunkWriteError(ev, err.Str(), NKikimrProto::ERROR);
Expand Down
46 changes: 45 additions & 1 deletion ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,50 @@ Y_UNIT_TEST_SUITE(TPDiskTest) {
UNIT_ASSERT_VALUES_EQUAL(writeLog(), NKikimrProto::OK);
}

Y_UNIT_TEST(TestChunkWriteCrossOwner) {
TActorTestContext testCtx({ false });

TVDiskMock vdisk1(&testCtx);
TVDiskMock vdisk2(&testCtx);

vdisk1.InitFull();
vdisk2.InitFull();

vdisk1.ReserveChunk();
vdisk2.ReserveChunk();

vdisk1.CommitReservedChunks();
vdisk2.CommitReservedChunks();

UNIT_ASSERT(vdisk1.Chunks[EChunkState::COMMITTED].size() == 1);
UNIT_ASSERT(vdisk2.Chunks[EChunkState::COMMITTED].size() == 1);

auto chunk1 = *vdisk1.Chunks[EChunkState::COMMITTED].begin();
auto chunk2 = *vdisk2.Chunks[EChunkState::COMMITTED].begin();

TString data(123, '0');
auto parts = MakeIntrusive<NPDisk::TEvChunkWrite::TStrokaBackedUpParts>(data);

// write to own chunk is OK
testCtx.TestResponse<NPDisk::TEvChunkWriteResult>(new NPDisk::TEvChunkWrite(
vdisk1.PDiskParams->Owner, vdisk1.PDiskParams->OwnerRound,
chunk1, 0, parts, nullptr, false, 0),
NKikimrProto::OK);
testCtx.TestResponse<NPDisk::TEvChunkWriteResult>(new NPDisk::TEvChunkWrite(
vdisk2.PDiskParams->Owner, vdisk2.PDiskParams->OwnerRound,
chunk2, 0, parts, nullptr, false, 0),
NKikimrProto::OK);

// write to neighbour's chunk is ERROR
testCtx.TestResponse<NPDisk::TEvChunkWriteResult>(new NPDisk::TEvChunkWrite(
vdisk1.PDiskParams->Owner, vdisk1.PDiskParams->OwnerRound,
chunk2, 0, parts, nullptr, false, 0),
NKikimrProto::ERROR);
testCtx.TestResponse<NPDisk::TEvChunkWriteResult>(new NPDisk::TEvChunkWrite(
vdisk2.PDiskParams->Owner, vdisk2.PDiskParams->OwnerRound,
chunk1, 0, parts, nullptr, false, 0),
NKikimrProto::ERROR);
}
}

Y_UNIT_TEST_SUITE(PDiskCompatibilityInfo) {
Expand Down Expand Up @@ -961,7 +1005,7 @@ Y_UNIT_TEST_SUITE(PDiskCompatibilityInfo) {

void TestMajorVerionMigration(TCurrent oldInfo, TCurrent intermediateInfo, TCurrent newInfo) {
TCompatibilityInfoTest::Reset(&oldInfo);

TActorTestContext testCtx({
.IsBad = false,
.SuppressCompatibilityCheck = false,
Expand Down