Merge c04c7d5 into a856194

Author: GrigoriyPA

ydb/core/mind/node_broker_ut.cpp

@@ -158,7 +158,7 @@ void SetupServices(TTestActorRuntime &runtime,
         SetupBSNodeWarden(runtime, nodeIndex, nodeWardenConfig);
         SetupNodeWhiteboard(runtime, nodeIndex);
         SetupTabletResolver(runtime, nodeIndex);
-        SetupResourceBroker(runtime, nodeIndex);
+        SetupResourceBroker(runtime, nodeIndex, {});
         SetupSharedPageCache(runtime, nodeIndex, NFake::TCaches{
             .Shared = 1,
         });

ydb/core/testlib/basics/appdata.h

@@ -13,6 +13,7 @@
 #include <ydb/core/protos/blobstorage.pb.h>
 #include <ydb/core/protos/datashard_config.pb.h>
 #include <ydb/core/protos/kqp.pb.h>
+#include <ydb/core/protos/resource_broker.pb.h>
 #include <ydb/core/protos/table_service_config.pb.h>
 #include <ydb/core/protos/pqconfig.pb.h>
 
@@ -106,6 +107,7 @@ namespace NKikimr {
         NKikimrConfig::TS3ProxyResolverConfig S3ProxyResolverConfig;
         NKikimrConfig::TGraphConfig GraphConfig;
         NKikimrConfig::TImmediateControlsConfig ImmediateControlsConfig;
+        NKikimrResourceBroker::TResourceBrokerConfig ResourceBrokerConfig;
         std::vector<TIntrusivePtr<NKikimr::TControlBoard>> Icb;
 
     private:

ydb/core/testlib/basics/helpers.h

@@ -44,7 +44,7 @@ namespace NFake {
     void SetupBSNodeWarden(TTestActorRuntime& runtime, ui32 nodeIndex, TIntrusivePtr<TNodeWardenConfig> nodeWardenConfig);
     void SetupTabletResolver(TTestActorRuntime& runtime, ui32 nodeIndex);
     void SetupTabletPipePerNodeCaches(TTestActorRuntime& runtime, ui32 nodeIndex, bool forceFollowers = false);
-    void SetupResourceBroker(TTestActorRuntime& runtime, ui32 nodeIndex);
+    void SetupResourceBroker(TTestActorRuntime& runtime, ui32 nodeIndex, const NKikimrResourceBroker::TResourceBrokerConfig& resourceBrokerConfig);
     void SetupSharedPageCache(TTestActorRuntime& runtime, ui32 nodeIndex, NFake::TCaches caches);
     void SetupNodeWhiteboard(TTestActorRuntime& runtime, ui32 nodeIndex);
     void SetupMonitoringProxy(TTestActorRuntime& runtime, ui32 nodeIndex);

ydb/core/testlib/basics/services.cpp

@@ -105,11 +105,16 @@ namespace NPDisk {
             TActorSetupCmd(CreatePipePerNodeCache(persistentPipeConfig), TMailboxType::Revolving, 0), nodeIndex);
     }
 
-    void SetupResourceBroker(TTestActorRuntime& runtime, ui32 nodeIndex)
+    void SetupResourceBroker(TTestActorRuntime& runtime, ui32 nodeIndex, const NKikimrResourceBroker::TResourceBrokerConfig& resourceBrokerConfig)
     {
+        NKikimrResourceBroker::TResourceBrokerConfig config = NResourceBroker::MakeDefaultConfig();
+        if (resourceBrokerConfig.IsInitialized()) {
+            NResourceBroker::MergeConfigUpdates(config, resourceBrokerConfig);
+        }
+
         runtime.AddLocalService(NResourceBroker::MakeResourceBrokerID(),
             TActorSetupCmd(
-                NResourceBroker::CreateResourceBrokerActor(NResourceBroker::MakeDefaultConfig(), runtime.GetDynamicCounters(0)),
+                NResourceBroker::CreateResourceBrokerActor(config, runtime.GetDynamicCounters(0)),
                 TMailboxType::Revolving, 0),
             nodeIndex);
     }
@@ -360,7 +365,7 @@ namespace NPDisk {
 
             SetupTabletResolver(runtime, nodeIndex);
             SetupTabletPipePerNodeCaches(runtime, nodeIndex, forceFollowers);
-            SetupResourceBroker(runtime, nodeIndex);
+            SetupResourceBroker(runtime, nodeIndex, app.ResourceBrokerConfig);
             SetupSharedPageCache(runtime, nodeIndex, caches);
             SetupBlobCache(runtime, nodeIndex);
             SetupSysViewService(runtime, nodeIndex);

ydb/core/testlib/test_client.cpp

@@ -186,6 +186,7 @@ namespace Tests {
         app.CompactionConfig = Settings->CompactionConfig;
         app.FeatureFlags = Settings->FeatureFlags;
         app.ImmediateControlsConfig = Settings->Controls;
+        app.ResourceBrokerConfig = Settings->AppConfig->GetResourceBrokerConfig();
         app.InitIcb(StaticNodes() + DynamicNodes());
 
         Runtime = MakeHolder<TTestBasicRuntime>(StaticNodes() + DynamicNodes(), Settings->UseRealThreads);

ydb/tests/tools/kqprun/src/ydb_setup.cpp

@@ -194,10 +194,7 @@ class TYdbSetup::TImpl {
     {
         InitializeYqlLogger();
         InitializeServer();
-
-        if (Settings_.NodeCount > 1) {
-            WaitResourcesPublishing();
-        }
+        WaitResourcesPublishing();
 
         if (Settings_.MonitoringEnabled) {
             Cout << CoutColors_.Cyan() << "Monitoring port: " << CoutColors_.Default() << Server_->GetRuntime()->GetMonPort() << Endl;