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

schemeshard: fix Alter{Ext,}SubDomain compatibility #9198

Merged
merged 1 commit into from
Sep 13, 2024
Merged

schemeshard: fix Alter{Ext,}SubDomain compatibility #9198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_alter_extsubdomain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ class TSyncHive: public TSubOperationState {
}

bool HandleReply(TEvHive::TEvUpdateDomainReply::TPtr& ev, TOperationContext& context) override {
const TTabletId hive = TTabletId(ev->Get()->Record.GetOrigin());
const TTabletId hive = TTabletId(ev->Get()->Record.GetOrigin());

LOG_I(DebugHint() << "HandleReply TEvUpdateDomainReply"
<< ", from hive: " << hive);
Expand Down Expand Up @@ -1084,7 +1084,13 @@ ISubOperation::TPtr CreateAlterExtSubDomain(TOperationId id, TTxState::ETxState
}

TVector<ISubOperation::TPtr> CreateCompatibleAlterExtSubDomain(TOperationId id, const TTxTransaction& tx, TOperationContext& context) {
Y_ABORT_UNLESS(tx.GetOperationType() == NKikimrSchemeOp::ESchemeOpAlterExtSubDomain);
//NOTE: Accepting ESchemeOpAlterSubDomain operation for an ExtSubDomain is a special compatibility case
// for those old subdomains that at the time went through migration to a separate tenants.
// Console tablet holds records about types of the subdomains but they hadn't been updated
// at the migration time. So Console still thinks that old subdomains are plain subdomains
// whereas they had been migrated to the extsubdomains.
// This compatibility case should be upholded until Console records would be updated.
Y_ABORT_UNLESS(tx.GetOperationType() == NKikimrSchemeOp::ESchemeOpAlterExtSubDomain || tx.GetOperationType() == NKikimrSchemeOp::ESchemeOpAlterSubDomain);

LOG_I("CreateCompatibleAlterExtSubDomain, opId " << id
<< ", feature flag EnableAlterDatabaseCreateHiveFirst " << context.SS->EnableAlterDatabaseCreateHiveFirst
Expand Down
108 changes: 108 additions & 0 deletions ydb/core/tx/schemeshard/ut_extsubdomain/ut_extsubdomain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,114 @@ Y_UNIT_TEST_SUITE(TSchemeShardExtSubDomainTest) {
NLs::UserAttrsEqual({{"user__attr_1", "value"}})});
}

Y_UNIT_TEST_FLAG(AlterWithPlainAlterSubdomain, AlterDatabaseCreateHiveFirst) {
TTestBasicRuntime runtime;
TTestEnv env(runtime, TTestEnvOptions().EnableAlterDatabaseCreateHiveFirst(AlterDatabaseCreateHiveFirst));
ui64 txId = 100;

// Create extsubdomain

TestCreateExtSubDomain(runtime, ++txId, "/MyRoot",
R"(Name: "USER_0")"
);
TestAlterExtSubDomain(runtime, ++txId, "/MyRoot",
R"(
Name: "USER_0"
ExternalSchemeShard: true
PlanResolution: 50
Coordinators: 1
Mediators: 1
TimeCastBucketsPerMediator: 2
StoragePools {
Name: "pool-1"
Kind: "hdd"
}
)"
);
env.TestWaitNotification(runtime, {txId, txId - 1});

// Altering extsubdomain but with plain altersubdomain should succeed
// (post tenant migration compatibility)

//NOTE: SubDomain and not ExtSubdomain
TestAlterSubDomain(runtime, ++txId, "/MyRoot",
R"(
Name: "USER_0"
ExternalSchemeShard: true
PlanResolution: 50
Coordinators: 1
Mediators: 1
TimeCastBucketsPerMediator: 2
StoragePools {
Name: "pool-1"
Kind: "hdd"
}
)"
);
env.TestWaitNotification(runtime, txId);
}

Y_UNIT_TEST_FLAG(AlterTwiceAndWithPlainAlterSubdomain, AlterDatabaseCreateHiveFirst) {
TTestBasicRuntime runtime;
TTestEnv env(runtime, TTestEnvOptions().EnableAlterDatabaseCreateHiveFirst(AlterDatabaseCreateHiveFirst));
ui64 txId = 100;

TestCreateExtSubDomain(runtime, ++txId, "/MyRoot",
R"(Name: "USER_0")"
);
TestAlterExtSubDomain(runtime, ++txId, "/MyRoot",
R"(
Name: "USER_0"
ExternalSchemeShard: true
PlanResolution: 50
Coordinators: 1
Mediators: 1
TimeCastBucketsPerMediator: 2
StoragePools {
Name: "pool-1"
Kind: "hdd"
}
)"
);
env.TestWaitNotification(runtime, {txId, txId - 1});

AsyncAlterExtSubDomain(runtime, ++txId, "/MyRoot",
R"(
Name: "USER_0"
ExternalSchemeShard: true
PlanResolution: 50
Coordinators: 1
Mediators: 1
TimeCastBucketsPerMediator: 2
StoragePools {
Name: "pool-1"
Kind: "hdd"
}
)"
);
// TestModificationResults(runtime, txId, {NKikimrScheme::StatusAccepted});
const auto firstAlterTxId = txId;

//NOTE: SubDomain vs ExtSubDomain
TestAlterSubDomain(runtime, ++txId, "/MyRoot",
R"(
Name: "USER_0"
ExternalSchemeShard: true
PlanResolution: 50
Coordinators: 1
Mediators: 1
TimeCastBucketsPerMediator: 2
StoragePools {
Name: "pool-1"
Kind: "hdd"
}
)",
{{NKikimrScheme::StatusMultipleModifications}}
);

env.TestWaitNotification(runtime, firstAlterTxId);
}

Y_UNIT_TEST(CreateWithOnlyDotsNotAllowed) {
TTestBasicRuntime runtime;
TTestEnv env(runtime);
Expand Down
Loading