Skip to content

Commit 11b4c44

Browse files
fix review
1 parent 7b1c49c commit 11b4c44

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

ydb/core/protos/feature_flags.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,5 +206,5 @@ message TFeatureFlags {
206206
optional bool SwitchToConfigV1 = 180 [default = false];
207207
optional bool EnableEncryptedExport = 181 [default = false];
208208
optional bool EnableAlterDatabase = 182 [default = false];
209-
optional bool EnableAutoDropping = 183 [default = true];
209+
optional bool EnableExportAutoDropping = 183 [default = true];
210210
}

ydb/core/tx/schemeshard/schemeshard_export__create.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ struct TSchemeShard::TExport::TTxProgress: public TSchemeShard::TXxport::TTxBase
11581158
Self->PersistExportItemState(db, exportInfo, itemIdx);
11591159

11601160
if (AllOf(exportInfo->Items, &TExportInfo::TItem::IsDone)) {
1161-
if (!AppData()->FeatureFlags.GetEnableAutoDropping()) {
1161+
if (!AppData()->FeatureFlags.GetEnableExportAutoDropping()) {
11621162
EndExport(exportInfo, EState::Done, db);
11631163
} else {
11641164
PrepareAutoDropping(Self, exportInfo, db);
@@ -1362,7 +1362,7 @@ struct TSchemeShard::TExport::TTxProgress: public TSchemeShard::TXxport::TTxBase
13621362
}
13631363
}
13641364
if (!itemHasIssues && AllOf(exportInfo->Items, &TExportInfo::TItem::IsDone)) {
1365-
if (!AppData()->FeatureFlags.GetEnableAutoDropping()) {
1365+
if (!AppData()->FeatureFlags.GetEnableExportAutoDropping()) {
13661366
exportInfo->State = EState::Done;
13671367
exportInfo->EndTime = TAppData::TimeProvider->Now();
13681368
} else {

ydb/core/tx/schemeshard/ut_export/ut_export.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ namespace {
150150
const ui64 exportId = txId;
151151
TestGetExport(runtime, schemeshardId, exportId, dbName, expectedStatus);
152152

153-
if (!runtime.GetAppData().FeatureFlags.GetEnableAutoDropping() && checkAutoDropping) {
153+
if (!runtime.GetAppData().FeatureFlags.GetEnableExportAutoDropping() && checkAutoDropping) {
154154
auto desc = DescribePath(runtime, "/MyRoot");
155155
Cerr << "desc: " << desc.GetPathDescription().ChildrenSize()<< Endl;
156156
UNIT_ASSERT(desc.GetPathDescription().ChildrenSize() > 1);
@@ -2830,7 +2830,7 @@ attributes {
28302830
)", S3Port());
28312831

28322832
Env();
2833-
Runtime().GetAppData().FeatureFlags.SetEnableAutoDropping(false);
2833+
Runtime().GetAppData().FeatureFlags.SetEnableExportAutoDropping(false);
28342834

28352835
Run(Runtime(), Env(), TVector<TString>{
28362836
R"(

ydb/core/tx/schemeshard/ut_export_reboots_s3/ut_export_reboots_s3.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ Y_UNIT_TEST_SUITE(TExportToS3WithRebootsTests) {
621621
});
622622
}
623623

624-
Y_UNIT_TEST(ShouldEnabledAutoDropping) {
624+
Y_UNIT_TEST(ShouldDisableAutoDropping) {
625625
TPortManager portManager;
626626
const ui16 port = portManager.GetPort();
627627

0 commit comments

Comments
 (0)