Skip to content

Commit 8fb35d4

Browse files
maximyurchukmaximyurchuk
committed
Revert "prestable-24-4: enable feature flag EnableAlterDatabaseCreateHiveFirst (ydb-platform#14076)"
This reverts commit 7a1008a.
1 parent 8d77ebe commit 8fb35d4

File tree

4 files changed

+15
-45
lines changed

4 files changed

+15
-45
lines changed

‎ydb/core/protos/feature_flags.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ message TFeatureFlags {
9494
optional bool EnableDataShardGenericReadSets = 81 [default = false];
9595
// enable alter database operation to create subdomain's system tablets
9696
// directly in subdomain's hive
97-
optional bool EnableAlterDatabaseCreateHiveFirst = 82 [default = true];
97+
optional bool EnableAlterDatabaseCreateHiveFirst = 82 [default = false];
9898
reserved 83; // EnableKqpDataQuerySourceRead
9999
optional bool EnableSmallDiskOptimization = 84 [default = true];
100100
optional bool EnableDataShardVolatileTransactions = 85 [default = true];

‎ydb/core/tx/coordinator/coordinator_ut.cpp‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,6 @@
88
#include <library/cpp/testing/unittest/registar.h>
99
#include <library/cpp/threading/future/async.h>
1010

11-
// ad-hoc test parametrization support: only for single boolean flag
12-
// taken from ydb/core/ut/common/kqp_ut_common.h:Y_UNIT_TEST_TWIN
13-
//TODO: introduce general support for test parametrization?
14-
#define Y_UNIT_TEST_FLAG(N, OPT) \
15-
template<bool OPT> void N(NUnitTest::TTestContext&); \
16-
struct TTestRegistration##N { \
17-
TTestRegistration##N() { \
18-
TCurrentTest::AddTest(#N "-" #OPT "-false", static_cast<void (*)(NUnitTest::TTestContext&)>(&N<false>), false); \
19-
TCurrentTest::AddTest(#N "-" #OPT "-true", static_cast<void (*)(NUnitTest::TTestContext&)>(&N<true>), false); \
20-
} \
21-
}; \
22-
static TTestRegistration##N testRegistration##N; \
23-
template<bool OPT> \
24-
void N(NUnitTest::TTestContext&)
25-
2611
namespace NKikimr::NFlatTxCoordinator::NTest {
2712

2813
using namespace Tests;
@@ -394,7 +379,7 @@ namespace NKikimr::NFlatTxCoordinator::NTest {
394379
Ydb::Cms::CreateDatabaseRequest,
395380
Ydb::Cms::CreateDatabaseResponse>;
396381

397-
Y_UNIT_TEST_FLAG(RestoreTenantConfiguration, AlterDatabaseCreateHiveFirst) {
382+
Y_UNIT_TEST(RestoreTenantConfiguration) {
398383
struct TCoordinatorHooks : public ICoordinatorHooks {
399384
bool AllowPersistConfig_ = true;
400385
std::unordered_map<ui64, NKikimrSubDomains::TProcessingParams> PersistConfig_;
@@ -412,8 +397,7 @@ namespace NKikimr::NFlatTxCoordinator::NTest {
412397
.SetNodeCount(1)
413398
.SetDynamicNodeCount(4)
414399
.SetUseRealThreads(false)
415-
.AddStoragePoolType("ssd")
416-
.SetEnableAlterDatabaseCreateHiveFirst(AlterDatabaseCreateHiveFirst);
400+
.AddStoragePoolType("ssd");
417401

418402
Tests::TServer::TPtr server = new TServer(serverSettings);
419403

@@ -430,8 +414,6 @@ namespace NKikimr::NFlatTxCoordinator::NTest {
430414
hooks.AllowPersistConfig_ = false;
431415
hooks.PersistConfig_.clear();
432416

433-
const ui32 ExpectedProcessingParamsVersion = 2 + (AlterDatabaseCreateHiveFirst ? 1 : 0);
434-
435417
auto createDatabase = [&]() {
436418
Ydb::Cms::CreateDatabaseRequest request;
437419
request.set_path("/Root/db1");
@@ -463,8 +445,8 @@ namespace NKikimr::NFlatTxCoordinator::NTest {
463445
UNIT_ASSERT_C(hooks.PersistConfig_.size() > 0, "Expected coordinators to attempt to persist configs");
464446
std::vector<ui64> coordinators;
465447
for (auto& pr : hooks.PersistConfig_) {
466-
UNIT_ASSERT_C(pr.second.GetVersion() == ExpectedProcessingParamsVersion,
467-
"Expected tenant coordinator to have a version " << ExpectedProcessingParamsVersion << " config:\n" << pr.second.DebugString());
448+
UNIT_ASSERT_C(pr.second.GetVersion() == 2,
449+
"Expected tenant coordinator to have a version 2 config:\n" << pr.second.DebugString());
468450
coordinators.push_back(pr.first);
469451
}
470452

@@ -478,8 +460,8 @@ namespace NKikimr::NFlatTxCoordinator::NTest {
478460
runtime.SimulateSleep(TDuration::MilliSeconds(50));
479461
UNIT_ASSERT_C(hooks.PersistConfig_.size() == coordinators.size(), "Expected all coordinators to persist restored config");
480462
for (auto& pr : hooks.PersistConfig_) {
481-
UNIT_ASSERT_C(pr.second.GetVersion() == ExpectedProcessingParamsVersion,
482-
"Expected tenant coordinator to restore a version " << ExpectedProcessingParamsVersion << " config:\n" << pr.second.DebugString());
463+
UNIT_ASSERT_C(pr.second.GetVersion() == 2,
464+
"Expected tenant coordinator to restore a version 2 config:\n" << pr.second.DebugString());
483465
}
484466

485467
// runtime.SetLogPriority(NKikimrServices::TABLET_MAIN, NActors::NLog::PRI_DEBUG);

‎ydb/core/tx/schemeshard/ut_serverless/ut_serverless.cpp‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ Y_UNIT_TEST_SUITE(TSchemeShardServerLess) {
1313
Y_UNIT_TEST(Fake) {
1414
}
1515

16-
Y_UNIT_TEST_FLAG(BaseCase, AlterDatabaseCreateHiveFirst) {
16+
Y_UNIT_TEST(BaseCase) {
1717
TTestBasicRuntime runtime;
18-
TTestEnv env(runtime, TTestEnvOptions().EnableAlterDatabaseCreateHiveFirst(AlterDatabaseCreateHiveFirst));
18+
TTestEnv env(runtime);
1919
ui64 txId = 100;
2020

2121
TestCreateExtSubDomain(runtime, ++txId, "/MyRoot",
@@ -106,17 +106,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardServerLess) {
106106
NLs::PathsInsideDomain(1),
107107
NLs::ShardsInsideDomain(0)});
108108

109-
// Check that shards of ServerLess0 db are gone after its deletion.
110-
//
111-
// SharedDB contains:
112-
// - 3 of its own shards: SchemeShard, Coordinator, Mediator
113-
// - 4 of ServerLess0's shards: SchemeShard, Coordinator, Mediator, 1 x DataShard of the table0
114-
//
115-
116-
//NOTE: AlterDatabaseCreateHiveFirst create system tablets in a tenant hive, otherwise they are created in the root hive
117-
ui64 sharedHiveTablets = TTestTxConfig::FakeHiveTablets + (AlterDatabaseCreateHiveFirst ? TFakeHiveState::TABLETS_PER_CHILD_HIVE : 1)
118-
+ 3 // shards of SharedDB
119-
;
109+
ui64 sharedHiveTablets = TTestTxConfig::FakeHiveTablets + NKikimr::TFakeHiveState::TABLETS_PER_CHILD_HIVE;
120110
env.TestWaitTabletDeletion(runtime, xrange(sharedHiveTablets, sharedHiveTablets + 4), sharedHive);
121111
}
122112

@@ -309,7 +299,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardServerLess) {
309299
UNIT_ASSERT(sharedDbSchemeShard != 0
310300
&& sharedDbSchemeShard != (ui64)-1
311301
&& sharedDbSchemeShard != TTestTxConfig::SchemeShard);
312-
302+
313303
TestDescribeResult(DescribePath(runtime, sharedDbSchemeShard, "/MyRoot/SharedDB"),
314304
{NLs::PathExist,
315305
NLs::ServerlessComputeResourcesMode(EServerlessComputeResourcesModeUnspecified)});
@@ -318,7 +308,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardServerLess) {
318308
R"(
319309
ResourcesDomainKey {
320310
SchemeShard: %lu
321-
PathId: 2
311+
PathId: 2
322312
}
323313
Name: "ServerLess0"
324314
)",
@@ -358,7 +348,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardServerLess) {
358348
TestDescribeResult(DescribePath(runtime, tenantSchemeShard, "/MyRoot/ServerLess0"),
359349
{NLs::PathExist,
360350
NLs::ServerlessComputeResourcesMode(EServerlessComputeResourcesModeShared)});
361-
351+
362352
auto checkServerlessComputeResourcesMode = [&](EServerlessComputeResourcesMode serverlessComputeResourcesMode) {
363353
TString alterData = Sprintf(
364354
R"(
@@ -416,7 +406,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardServerLess) {
416406
R"(
417407
ResourcesDomainKey {
418408
SchemeShard: %lu
419-
PathId: 2
409+
PathId: 2
420410
}
421411
Name: "ServerLess0"
422412
)",
@@ -497,7 +487,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardServerLess) {
497487
R"(
498488
ResourcesDomainKey {
499489
SchemeShard: %lu
500-
PathId: 2
490+
PathId: 2
501491
}
502492
Name: "ServerLess0"
503493
)",

‎ydb/core/tx/schemeshard/ut_serverless/ya.make‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ TIMEOUT(600)
66

77
SIZE(MEDIUM)
88

9-
TIMEOUT(120)
10-
119
PEERDIR(
1210
library/cpp/getopt
1311
library/cpp/regex/pcre

0 commit comments

Comments
 (0)