@@ -180,7 +180,7 @@ class TPoolFetcherActor : public TSchemeActorBase<TPoolFetcherActor> {
180
180
LOG_D (" Start pool fetching" );
181
181
auto event = NTableCreator::BuildSchemeCacheNavigateRequest (
182
182
{{" .metadata/workload_manager/pools" , PoolId}},
183
- Database,
183
+ Database ? Database : AppData ()-> TenantName ,
184
184
UserToken
185
185
);
186
186
event->ResultSet [0 ].Access |= NACLib::SelectRow;
@@ -326,7 +326,7 @@ class TPoolCreatorActor : public TSchemeActorBase<TPoolCreatorActor> {
326
326
auto event = std::make_unique<TEvTxUserProxy::TEvProposeTransaction>();
327
327
328
328
auto & schemeTx = *event->Record .MutableTransaction ()->MutableModifyScheme ();
329
- schemeTx.SetWorkingDir (JoinPath ({Database, " .metadata/workload_manager/pools" }));
329
+ schemeTx.SetWorkingDir (JoinPath ({Database ? Database : AppData ()-> TenantName , " .metadata/workload_manager/pools" }));
330
330
schemeTx.SetOperationType (NKikimrSchemeOp::ESchemeOpCreateResourcePool);
331
331
schemeTx.SetInternal (true );
332
332
@@ -483,7 +483,13 @@ class TDatabaseFetcherActor : public TSchemeActorBase<TDatabaseFetcherActor> {
483
483
}
484
484
return ;
485
485
case EStatus::Ok:
486
- Serverless = result.DomainInfo && result.DomainInfo ->IsServerless ();
486
+ if (result.DomainInfo ) {
487
+ Serverless = result.DomainInfo ->IsServerless ();
488
+ if (result.Self ->Info .GetPathId () != result.DomainInfo ->DomainKey .LocalPathId ) {
489
+ Reply (Ydb::StatusIds::UNSUPPORTED, TStringBuilder () << " Invalid database " << Database << " , domain path id is different" );
490
+ return ;
491
+ }
492
+ }
487
493
Reply (Ydb::StatusIds::SUCCESS);
488
494
return ;
489
495
}
@@ -500,7 +506,11 @@ class TDatabaseFetcherActor : public TSchemeActorBase<TDatabaseFetcherActor> {
500
506
protected:
501
507
void StartRequest () override {
502
508
LOG_D (" Start database fetching" );
503
- auto event = NTableCreator::BuildSchemeCacheNavigateRequest ({{}}, Database, UserToken);
509
+ auto event = NTableCreator::BuildSchemeCacheNavigateRequest (
510
+ {{}},
511
+ Database ? Database : AppData ()->TenantName ,
512
+ UserToken
513
+ );
504
514
event->ResultSet [0 ].Operation = NSchemeCache::TSchemeCacheNavigate::OpPath;
505
515
event->ResultSet [0 ].Access |= CheckAccess;
506
516
Send (MakeSchemeCacheID (), new TEvTxProxySchemeCache::TEvNavigateKeySet (event.Release ()), IEventHandle::FlagTrackDelivery);
0 commit comments