Skip to content
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

Jump to bottom

Resize the shadow disk when the size of the source disk changes #2152

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Resize the shadow disk when the size of the source disk changes #2152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cebf5f9
Resize the shadow disk when the size of the source disk changes
drbasic Sep 27, 2024
708e055
Rename method
drbasic Sep 28, 2024
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
45 changes: 42 additions & 3 deletions cloud/blockstore/libs/storage/disk_registry/disk_registry_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2010,6 +2010,8 @@ NProto::TError TDiskRegistryState::AllocateDisk(
auto& disk = Disks[params.DiskId];
auto error = ValidateAllocateDiskParams(disk, params);

auto originalBlockCount = GetDiskBlockCount(params.DiskId);

if (HasError(error)) {
if (disk.Devices.empty() && !disk.ReplicaCount) {
Disks.erase(params.DiskId);
Expand All @@ -2019,11 +2021,19 @@ NProto::TError TDiskRegistryState::AllocateDisk(
return error;
}

if (params.ReplicaCount) {
return AllocateMirroredDisk(now, db, params, disk, result);
NProto::TError allocateError =
params.ReplicaCount
? AllocateMirroredDisk(now, db, params, disk, result)
: AllocateSimpleDisk(now, db, params, {}, disk, result);

// If disk size changed reallocate checkpoints too.
if (!HasError(allocateError) && originalBlockCount &&
originalBlockCount != GetDiskBlockCount(params.DiskId))
{
ReallocateCheckpointByDisk(now, db, params.DiskId);
}

return AllocateSimpleDisk(now, db, params, {}, disk, result);
return allocateError;
}

NProto::TError TDiskRegistryState::AllocateCheckpoint(
Expand Down Expand Up @@ -2818,6 +2828,24 @@ void TDiskRegistryState::DeleteCheckpointByDisk(
}
}

void TDiskRegistryState::ReallocateCheckpointByDisk(
TInstant now,
TDiskRegistryDatabase& db,
const TDiskId& diskId)
{
TVector<TCheckpointId> checkpointsToReallocate;
for (const auto& [id, checkpointInfo]: Checkpoints) {
if (checkpointInfo.SourceDiskId == diskId) {
checkpointsToReallocate.push_back(checkpointInfo.CheckpointId);
}
}

for (const auto& checkpointId: checkpointsToReallocate) {
TAllocateCheckpointResult result;
AllocateCheckpoint(now, db, diskId, checkpointId, &result);
}
}

void TDiskRegistryState::AddToBrokenDisks(
TInstant now,
TDiskRegistryDatabase& db,
Expand Down Expand Up @@ -7240,4 +7268,15 @@ TVector<NProto::TAgentInfo> TDiskRegistryState::QueryAgentsInfo() const
return ret;
}

std::optional<ui64> TDiskRegistryState::GetDiskBlockCount(
const TDiskId& diskId) const
{
TDiskInfo diskInfo;
auto error = GetDiskInfo(diskId, diskInfo);
if (HasError(error)) {
return std::nullopt;
}
return diskInfo.GetBlocksCount();
}

} // namespace NCloud::NBlockStore::NStorage
6 changes: 6 additions & 0 deletions cloud/blockstore/libs/storage/disk_registry/disk_registry_state.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,6 +1125,10 @@ class TDiskRegistryState
void DeleteCheckpointByDisk(
TDiskRegistryDatabase& db,
const TDiskId& diskId);
void ReallocateCheckpointByDisk(
TInstant now,
TDiskRegistryDatabase& db,
const TDiskId& diskId);

void ForgetDevices(
TDiskRegistryDatabase& db,
Expand Down Expand Up @@ -1258,6 +1262,8 @@ class TDiskRegistryState
struct TConfigUpdateEffect;
TResultOrError<TConfigUpdateEffect> CalcConfigUpdateEffect(
const NProto::TDiskRegistryConfig& newConfig) const;

std::optional<ui64> GetDiskBlockCount(const TDiskId& diskId) const;
};

} // namespace NCloud::NBlockStore::NStorage
88 changes: 88 additions & 0 deletions cloud/blockstore/libs/storage/disk_registry/disk_registry_ut_checkpoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,94 @@ Y_UNIT_TEST_SUITE(TDiskRegistryTest)
}
}

Y_UNIT_TEST(ShouldReallocateShadowDiskOnSourceDiskReallocation)
{
const auto agent1 = CreateAgentConfig(
"agent-1",
{
Device("dev-1", "uuid-1", "rack-1", 10_GB),
Device("dev-2", "uuid-2", "rack-1", 10_GB),
});

const auto agent2 = CreateAgentConfig(
"agent-2",
{
Device("dev-1", "uuid-4", "rack-1", 10_GB),
Device("dev-2", "uuid-5", "rack-1", 10_GB),
});

auto runtime =
TTestRuntimeBuilder().WithAgents({agent1, agent2}).Build();

TDiskRegistryClient diskRegistry(*runtime);
diskRegistry.WaitReady();
diskRegistry.SetWritableState(true);

diskRegistry.UpdateConfig(CreateRegistryConfig(0, {agent1, agent2}));

RegisterAgents(*runtime, 2);
WaitForAgents(*runtime, 2);
WaitForSecureErase(*runtime, {agent1, agent2});

// Allocate disk.
{
auto response = diskRegistry.AllocateDisk("disk-1", 10_GB);
UNIT_ASSERT_VALUES_EQUAL_C(
S_OK,
response->GetStatus(),
response->GetError());
}

TString shadowDiskId;
// Create checkpoint
{
auto response =
diskRegistry.AllocateCheckpoint("disk-1", "checkpoint-1");

UNIT_ASSERT_VALUES_EQUAL_C(
S_OK,
response->GetStatus(),
response->GetError());

shadowDiskId = response->Record.GetShadowDiskId();
}

// Check the size of the shadow disk
{
auto response = diskRegistry.DescribeDisk(shadowDiskId);
UNIT_ASSERT_VALUES_EQUAL_C(
S_OK,
response->GetStatus(),
response->GetError());

auto checkpointSize = response->Record.GetBlocksCount() *
response->Record.GetBlockSize();
UNIT_ASSERT_VALUES_EQUAL(10_GB, checkpointSize);
}

// Reallocate disk
{
auto response = diskRegistry.AllocateDisk("disk-1", 20_GB);
UNIT_ASSERT_VALUES_EQUAL_C(
S_OK,
response->GetStatus(),
response->GetError());
}

// Check that the size of the shadow disk has also changed
{
auto response = diskRegistry.DescribeDisk(shadowDiskId);
UNIT_ASSERT_VALUES_EQUAL_C(
S_OK,
response->GetStatus(),
response->GetError());

auto checkpointSize = response->Record.GetBlocksCount() *
response->Record.GetBlockSize();
UNIT_ASSERT_VALUES_EQUAL(20_GB, checkpointSize);
}
}

Y_UNIT_TEST(ShouldChangeStateForCheckpoint)
{
const auto agent1 = CreateAgentConfig(
Expand Down
Loading