Skip to content

Commit 7711c80

Browse files
committed
Move delete logic from barrier essense to handoff map
1 parent 1292d3e commit 7711c80

39 files changed

+174
-1443
lines changed

ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ TDefaultVDiskSetup::TDefaultVDiskSetup() {
236236
cfg->SyncJobTimeout = TDuration::Seconds(20);
237237
cfg->RunSyncer = true;
238238
cfg->ReplTimeInterval = TDuration::Seconds(10);
239-
cfg->RunHandoff = true;
240239
cfg->SkeletonFrontQueueBackpressureCheckMsgId = false;
241240
};
242241
AddConfigModifier(modifier);

ydb/core/blobstorage/ut_vdisk/lib/setup.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ struct TFastVDiskSetupHndOff : public TFastVDiskSetup {
6666
TFastVDiskSetupHndOff() {
6767
auto modifier = [] (NKikimr::TVDiskConfig *cfg) {
6868
cfg->HullCompLevelRateThreshold = 0.01; // to compact very few chunks from level 0
69-
cfg->RunHandoff = false; // do not run handoff
7069
};
7170
AddConfigModifier(modifier);
7271
}
@@ -82,12 +81,7 @@ struct TFastVDiskSetupCompacted : public TFastVDiskSetup {
8281
};
8382

8483
struct TFastVDiskSetupCompactedHndOff : public TFastVDiskSetupCompacted {
85-
TFastVDiskSetupCompactedHndOff() {
86-
auto modifier = [] (NKikimr::TVDiskConfig *cfg) {
87-
cfg->RunHandoff = false; // do not run handoff
88-
};
89-
AddConfigModifier(modifier);
90-
}
84+
TFastVDiskSetupCompactedHndOff() = default;
9185
};
9286

9387
struct TFastCompactionGCNoSyncVDiskSetup : public TFastVDiskSetup {

ydb/core/blobstorage/ut_vdisk/lib/test_synclog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class TSyncLogTestWriteActor : public TActorBootstrapped<TSyncLogTestWriteActor>
170170
VDiskConfig = vDiskInstance.Cfg;
171171
TestCtx->SelfVDiskId = groupInfo->GetVDiskId(VCtx->ShortSelfVDisk);
172172

173-
Db = MakeIntrusive<TDb>(VDiskConfig, groupInfo, VCtx);
173+
Db = MakeIntrusive<TDb>(VDiskConfig, VCtx);
174174

175175
ctx.Send(VDiskConfig->BaseInfo.PDiskActorID,
176176
new NPDisk::TEvYardInit(2, TestCtx->SelfVDiskId, VDiskConfig->BaseInfo.PDiskGuid));

ydb/core/blobstorage/vdisk/handoff/handoff_map.h renamed to ydb/core/blobstorage/vdisk/balance/handoff_map.h

Lines changed: 100 additions & 160 deletions
Large diffs are not rendered by default.

ydb/core/blobstorage/vdisk/balance/ya.make

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ PEERDIR(
1212
SRCS(
1313
balancing_actor.cpp
1414
deleter.cpp
15+
handoff_map.cpp
1516
sender.cpp
1617
utils.cpp
1718
)

ydb/core/blobstorage/vdisk/common/vdisk_config.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ namespace NKikimr {
7878
HandoffMaxInFlightByteSize = 16u << 20u;
7979
HandoffTimeout = TDuration::Seconds(10);
8080
RunRepl = !baseInfo.ReadOnly;
81-
RunHandoff = false;
8281

8382
SkeletonFrontGets_MaxInFlightCount = 24;
8483
SkeletonFrontGets_MaxInFlightCost = 200000000; // 200ms

ydb/core/blobstorage/vdisk/common/vdisk_config.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ namespace NKikimr {
170170
ui32 HandoffMaxInFlightByteSize;
171171
TDuration HandoffTimeout;
172172
bool RunRepl;
173-
bool RunHandoff;
174173
bool ReplPausedAtStart = false;
175174

176175
///////////// SKELETON SETTINGS /////////////////////

ydb/core/blobstorage/vdisk/handoff/defs.h

Lines changed: 0 additions & 4 deletions
This file was deleted.

ydb/core/blobstorage/vdisk/handoff/handoff_basic.cpp

Lines changed: 0 additions & 169 deletions
This file was deleted.

0 commit comments

Comments
 (0)