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

NBS-4827 extract TNonreplicatedPartitionMigrationCommonActor (#194) #284

Merged
merged 3 commits into from
Feb 6, 2024
Merged

NBS-4827 extract TNonreplicatedPartitionMigrationCommonActor (#194) #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72dd436
NBS-4827 extract TNonreplicatedPartitionMigrationCommonActor (#194)
drbasic Jan 30, 2024
9dc0dc7
NBS-4827 fix CMake files
drbasic Jan 30, 2024
f595876
NBS-4827 fix cherry-pick error
drbasic Feb 2, 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
15 changes: 8 additions & 7 deletions cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.darwin-x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ target_sources(libs-storage-partition_nonrepl PRIVATE
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/copy_range.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/replica_info.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/resync_range.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/mirror_request_actor.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_actor.cpp
Expand Down Expand Up @@ -69,10 +70,10 @@ target_sources(libs-storage-partition_nonrepl PRIVATE
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_rdma_actor_zeroblocks.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_migration.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_mirror.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks_local.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_stats.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_state.cpp
)
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_migration.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_mirror.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks_local.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_stats.cpp
)
13 changes: 7 additions & 6 deletions cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.linux-aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ target_sources(libs-storage-partition_nonrepl PRIVATE
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/copy_range.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/replica_info.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/resync_range.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/mirror_request_actor.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_actor.cpp
Expand Down Expand Up @@ -70,10 +71,10 @@ target_sources(libs-storage-partition_nonrepl PRIVATE
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_rdma_actor_zeroblocks.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_migration.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_mirror.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks_local.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_stats.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_state.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_migration.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_mirror.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks_local.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_stats.cpp
)
13 changes: 7 additions & 6 deletions cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.linux-x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ target_sources(libs-storage-partition_nonrepl PRIVATE
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/copy_range.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/replica_info.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/resync_range.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/mirror_request_actor.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_actor.cpp
Expand Down Expand Up @@ -70,10 +71,10 @@ target_sources(libs-storage-partition_nonrepl PRIVATE
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_rdma_actor_zeroblocks.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_migration.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_mirror.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks_local.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_stats.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_state.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_migration.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_mirror.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks_local.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_stats.cpp
)
13 changes: 7 additions & 6 deletions cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.windows-x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ target_sources(libs-storage-partition_nonrepl PRIVATE
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/copy_range.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/replica_info.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/resync_range.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/mirror_request_actor.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_actor.cpp
Expand Down Expand Up @@ -69,10 +70,10 @@ target_sources(libs-storage-partition_nonrepl PRIVATE
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_rdma_actor_zeroblocks.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_migration.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_mirror.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks_local.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_stats.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_state.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_migration.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_mirror.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks_local.cpp
${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_stats.cpp
)
49 changes: 49 additions & 0 deletions cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#include "migration_timeout_calculator.h"

#include <cloud/blockstore/libs/storage/core/config.h>
#include <cloud/blockstore/libs/storage/partition_nonrepl/config.h>

namespace NCloud::NBlockStore::NStorage {

///////////////////////////////////////////////////////////////////////////////

TMigrationTimeoutCalculator::TMigrationTimeoutCalculator(
TStorageConfigPtr config,
TNonreplicatedPartitionConfigPtr partitionConfig)
: Config(std::move(config))
, PartitionConfig(std::move(partitionConfig))
{}

TDuration TMigrationTimeoutCalculator::CalculateTimeout(
TBlockRange64 nextProcessingRange) const
{
const ui32 maxMigrationBandwidthMiBs = Config->GetMaxMigrationBandwidth();
const ui32 expectedDiskAgentSize = Config->GetExpectedDiskAgentSize();

// migration range is 4_MB
const auto migrationFactorPerAgent = maxMigrationBandwidthMiBs / 4;

if (PartitionConfig->GetUseSimpleMigrationBandwidthLimiter()) {
return TDuration::Seconds(1) / migrationFactorPerAgent;
}

const auto& sourceDevices = PartitionConfig->GetDevices();
const auto requests =
PartitionConfig->ToDeviceRequests(nextProcessingRange);

ui32 agentDeviceCount = 0;
if (!requests.empty()) {
agentDeviceCount = CountIf(
sourceDevices,
[&](const auto& d)
{ return d.GetAgentId() == requests.front().Device.GetAgentId(); });
}

const auto factor =
Max(migrationFactorPerAgent * agentDeviceCount / expectedDiskAgentSize,
1U);

return TDuration::Seconds(1) / factor;
}

} // namespace NCloud::NBlockStore::NStorage
27 changes: 27 additions & 0 deletions cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#pragma once

#include <cloud/blockstore/libs/common/block_range.h>
#include <cloud/blockstore/libs/storage/core/public.h>
#include <cloud/blockstore/libs/storage/partition_nonrepl/public.h>

#include <util/datetime/base.h>

namespace NCloud::NBlockStore::NStorage {

// Calculates the time during which a 4MB block should migrate.
class TMigrationTimeoutCalculator
{
private:
const TStorageConfigPtr Config;
TNonreplicatedPartitionConfigPtr PartitionConfig;

public:
TMigrationTimeoutCalculator(
TStorageConfigPtr config,
TNonreplicatedPartitionConfigPtr partitionConfig);

[[nodiscard]] TDuration CalculateTimeout(
TBlockRange64 nextProcessingRange) const;
};

} // namespace NCloud::NBlockStore::NStorage
144 changes: 144 additions & 0 deletions cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
#include "migration_timeout_calculator.h"

#include <cloud/blockstore/config/storage.pb.h>
#include <cloud/blockstore/libs/storage/core/config.h>
#include <cloud/blockstore/libs/storage/partition_nonrepl/config.h>

#include <library/cpp/testing/unittest/registar.h>

namespace NCloud::NBlockStore::NStorage {

////////////////////////////////////////////////////////////////////////////////

namespace {

TDevices MakeDevices()
{
TDevices result;
{
auto* device = result.Add();
device->SetAgentId("Agent#1");
device->SetBlocksCount(1024);
device->SetDeviceUUID("1_1");
}
{
auto* device = result.Add();
device->SetAgentId("Agent#1");
device->SetBlocksCount(1024);
device->SetDeviceUUID("1_2");
}
{
auto* device = result.Add();
device->SetAgentId("Agent#2");
device->SetBlocksCount(1024);
device->SetDeviceUUID("2_1");
}
{
auto* device = result.Add();
device->SetAgentId("Agent#1");
device->SetBlocksCount(1024);
device->SetDeviceUUID("1_3");
}
return result;
}

TStorageConfigPtr MakeStorageConfig(ui32 expectedDiskAgentSize)
{
NProto::TStorageServiceConfig storageConfig;
storageConfig.SetMaxMigrationBandwidth(16);
storageConfig.SetExpectedDiskAgentSize(expectedDiskAgentSize);

return std::make_shared<TStorageConfig>(std::move(storageConfig), nullptr);
}

TNonreplicatedPartitionConfigPtr MakePartitionConfig(
TDevices devices,
bool useSimpleMigrationBandwidthLimiter)
{
return std::make_shared<TNonreplicatedPartitionConfig>(
devices,
NProto::VOLUME_IO_OK,
"vol0",
4_KB,
TNonreplicatedPartitionConfig::TVolumeInfo{
Now(),
// only SSD/HDD distinction matters
NProto::STORAGE_MEDIA_SSD_NONREPLICATED},
NActors::TActorId(),
false, // muteIOErrors
false, // markBlocksUsed
THashSet<TString>(), // freshDeviceIds
TDuration::Zero(), // maxTimedOutDeviceStateDuration
false, // maxTimedOutDeviceStateDurationOverridden
useSimpleMigrationBandwidthLimiter);
}

} // namespace

Y_UNIT_TEST_SUITE(TMigrationCalculatorTest)
{
Y_UNIT_TEST(ShouldCalculateMigrationTimeout)
{
TMigrationTimeoutCalculator timeoutCalculator(
MakeStorageConfig(4),
MakePartitionConfig(MakeDevices(), false));

// Devices #1, #2, #4 belong to Agent#1, device #3 belong to Agent#2.
// Therefore, we expect a timeout of 3 times less for 1,2,4 devices than
// for the 3rd device.

UNIT_ASSERT_VALUES_EQUAL(
TDuration::Seconds(1) / 3,
timeoutCalculator.CalculateTimeout(
TBlockRange64::WithLength(1024 * 0, 1024)));

UNIT_ASSERT_VALUES_EQUAL(
TDuration::Seconds(1) / 3,
timeoutCalculator.CalculateTimeout(
TBlockRange64::WithLength(1024 * 1, 1024)));

//
UNIT_ASSERT_VALUES_EQUAL(
TDuration::Seconds(1),
timeoutCalculator.CalculateTimeout(
TBlockRange64::WithLength(1024 * 2, 1024)));

UNIT_ASSERT_VALUES_EQUAL(
TDuration::Seconds(1) / 3,
timeoutCalculator.CalculateTimeout(
TBlockRange64::WithLength(1024 * 3, 1024)));
}

Y_UNIT_TEST(ShouldCalculateMigrationTimeoutWithSimpleLimiter)
{
TMigrationTimeoutCalculator timeoutCalculator(
MakeStorageConfig(100500),
MakePartitionConfig(MakeDevices(), true));

// When UseSimpleMigrationBandwidthLimiter enabled we expect the same
// timeout for all devices. This timeout does not depend on the expected
// number of devices on the agent (ExpectedDiskAgentSize).

UNIT_ASSERT_VALUES_EQUAL(
TDuration::Seconds(1) / 4,
timeoutCalculator.CalculateTimeout(
TBlockRange64::WithLength(1024 * 0, 1024)));

UNIT_ASSERT_VALUES_EQUAL(
TDuration::Seconds(1) / 4,
timeoutCalculator.CalculateTimeout(
TBlockRange64::WithLength(1024 * 1, 1024)));

UNIT_ASSERT_VALUES_EQUAL(
TDuration::Seconds(1) / 4,
timeoutCalculator.CalculateTimeout(
TBlockRange64::WithLength(1024 * 2, 1024)));

UNIT_ASSERT_VALUES_EQUAL(
TDuration::Seconds(1) / 4,
timeoutCalculator.CalculateTimeout(
TBlockRange64::WithLength(1024 * 3, 1024)));
}
}

} // namespace NCloud::NBlockStore::NStorage
1 change: 0 additions & 1 deletion cloud/blockstore/libs/storage/partition_nonrepl/model/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ SRCS(

PEERDIR(
cloud/blockstore/libs/common

cloud/storage/core/libs/common
)

Expand Down
Loading
Loading