@@ -1285,7 +1285,20 @@ namespace NKikimr::NYaml {
1285
1285
}
1286
1286
1287
1287
if (!domain.HasSchemeRoot ()) {
1288
- domain.SetSchemeRoot (72057594046678944 );
1288
+ std::optional<ui64> schemeRoot;
1289
+ if (config.HasBootstrapConfig ()) {
1290
+ for (const auto & tablet : config.GetBootstrapConfig ().GetTablet ()) {
1291
+ if (tablet.GetType () != NKikimrConfig::TBootstrap::FLAT_SCHEMESHARD) {
1292
+ continue ;
1293
+ }
1294
+ Y_ABORT_UNLESS (tablet.HasInfo ());
1295
+ Y_ABORT_UNLESS (tablet.GetInfo ().HasTabletID ());
1296
+ const ui64 id = tablet.GetInfo ().GetTabletID ();
1297
+ Y_ABORT_UNLESS (!schemeRoot || *schemeRoot == id);
1298
+ schemeRoot.emplace (id);
1299
+ }
1300
+ }
1301
+ domain.SetSchemeRoot (schemeRoot.value_or (72057594046678944 ));
1289
1302
}
1290
1303
1291
1304
if (!domain.HasPlanResolution ()) {
@@ -1426,8 +1439,8 @@ namespace NKikimr::NYaml {
1426
1439
PrepareStaticGroup (ctx, config, ephemeralConfig);
1427
1440
PrepareBlobStorageConfig (config, ephemeralConfig);
1428
1441
PrepareSystemTabletsInfo (config, ephemeralConfig, relaxed);
1429
- PrepareDomainsConfig (config, ephemeralConfig, relaxed);
1430
1442
PrepareBootstrapConfig (config, ephemeralConfig, relaxed);
1443
+ PrepareDomainsConfig (config, ephemeralConfig, relaxed);
1431
1444
PrepareIcConfig (config, ephemeralConfig);
1432
1445
PrepareGrpcConfig (config, ephemeralConfig);
1433
1446
PrepareSecurityConfig (ctx, config, relaxed);
0 commit comments