diff --git a/cloud/blockstore/libs/daemon/ydb/bootstrap.cpp b/cloud/blockstore/libs/daemon/ydb/bootstrap.cpp index 5d1d7dabfc5..33064d57c4a 100644 --- a/cloud/blockstore/libs/daemon/ydb/bootstrap.cpp +++ b/cloud/blockstore/libs/daemon/ydb/bootstrap.cpp @@ -574,6 +574,7 @@ void TBootstrapYdb::InitKikimrService() args.VolumeBalancerSwitch = VolumeBalancerSwitch; args.EndpointEventHandler = EndpointEventHandler; args.RootKmsKeyProvider = RootKmsKeyProvider; + args.TemporaryServer = Configs->Options->TemporaryServer; ActorSystem = NStorage::CreateActorSystem(args); diff --git a/cloud/blockstore/libs/storage/init/server/actorsystem.cpp b/cloud/blockstore/libs/storage/init/server/actorsystem.cpp index feb47d5e1f2..9df8560c580 100644 --- a/cloud/blockstore/libs/storage/init/server/actorsystem.cpp +++ b/cloud/blockstore/libs/storage/init/server/actorsystem.cpp @@ -140,17 +140,22 @@ class TStorageServicesInitializer final auto hiveProxy = CreateHiveProxy( { - .PipeClientRetryCount = Args.StorageConfig->GetPipeClientRetryCount(), - .PipeClientMinRetryTime = Args.StorageConfig->GetPipeClientMinRetryTime(), - .HiveLockExpireTimeout = Args.StorageConfig->GetHiveLockExpireTimeout(), + .PipeClientRetryCount = + Args.StorageConfig->GetPipeClientRetryCount(), + .PipeClientMinRetryTime = + Args.StorageConfig->GetPipeClientMinRetryTime(), + .HiveLockExpireTimeout = + Args.StorageConfig->GetHiveLockExpireTimeout(), .LogComponent = TBlockStoreComponents::HIVE_PROXY, - .TabletBootInfoBackupFilePath = Args.StorageConfig->GetTabletBootInfoBackupFilePath(), + .TabletBootInfoBackupFilePath = + Args.TemporaryServer + ? "" + : Args.StorageConfig->GetTabletBootInfoBackupFilePath(), .FallbackMode = Args.StorageConfig->GetHiveProxyFallbackMode(), - .TenantHiveTabletId = Args.StorageConfig->GetTenantHiveTabletId(), + .TenantHiveTabletId = + Args.StorageConfig->GetTenantHiveTabletId(), }, - appData - ->Counters - ->GetSubgroup("counters", "blockstore") + appData->Counters->GetSubgroup("counters", "blockstore") ->GetSubgroup("component", "service")); setup->LocalServices.emplace_back( diff --git a/cloud/blockstore/libs/storage/init/server/actorsystem.h b/cloud/blockstore/libs/storage/init/server/actorsystem.h index b8c8c8dff68..a75978de3d7 100644 --- a/cloud/blockstore/libs/storage/init/server/actorsystem.h +++ b/cloud/blockstore/libs/storage/init/server/actorsystem.h @@ -71,6 +71,7 @@ struct TServerActorSystemArgs TVector UserCounterProviders; bool IsDiskRegistrySpareNode = false; + bool TemporaryServer = false; }; //////////////////////////////////////////////////////////////////////////////// diff --git a/cloud/storage/core/libs/hive_proxy/hive_proxy_ut.cpp b/cloud/storage/core/libs/hive_proxy/hive_proxy_ut.cpp index 20c292e4950..16cd7982dda 100644 --- a/cloud/storage/core/libs/hive_proxy/hive_proxy_ut.cpp +++ b/cloud/storage/core/libs/hive_proxy/hive_proxy_ut.cpp @@ -1105,15 +1105,27 @@ Y_UNIT_TEST_SUITE(THiveProxyTest) UNIT_ASSERT(env.HiveState->DownNodeIds.contains(sender.NodeId())); } + Y_UNIT_TEST(DontBackupWithEmptyBootInfoFilePath) + { + TString backupFilePath = ""; + + TTestBasicRuntime runtime; + TTestEnv env(runtime, backupFilePath); + + auto sender = runtime.AllocateEdgeActor(); + + env.SendBackupTabletBootInfos(sender, S_FALSE); + } + Y_UNIT_TEST(BootExternalInFallbackMode) { - TString cacheFilePath = - "BootExternalInFallbackMode.tablet_boot_info_cache.txt";; + TString backupFilePath = + "BootExternalInFallbackMode.tablet_boot_info_backup.txt"; bool fallbackMode = false; { TTestBasicRuntime runtime; - TTestEnv env(runtime, cacheFilePath, fallbackMode); + TTestEnv env(runtime, backupFilePath, fallbackMode); TTabletStorageInfoPtr expected = CreateTestTabletInfo( FakeTablet2, @@ -1139,7 +1151,7 @@ Y_UNIT_TEST_SUITE(THiveProxyTest) fallbackMode = true; { TTestBasicRuntime runtime; - TTestEnv env(runtime, cacheFilePath, fallbackMode); + TTestEnv env(runtime, backupFilePath, fallbackMode); auto sender = runtime.AllocateEdgeActor();