In tiny mode use lower scheduling resolution (#27893) (#28736)

eivanov89 · web-flow · commit c86ec9177ea8 · 2025-11-13T14:32:32.000+01:00
diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile
@@ -46,6 +46,6 @@ EXPOSE ${GRPC_PORT:-2136}
 EXPOSE ${MON_PORT:-8765}
 EXPOSE ${YDB_KAFKA_PROXY_PORT:-9092}
 
-HEALTHCHECK --start-period=60s --interval=1s CMD sh /health_check
+HEALTHCHECK --start-period=60s --interval=60s CMD sh /health_check
 
 CMD ["sh", "/initialize_local_ydb"]
diff --git a/.github/docker/files/initialize_local_ydb b/.github/docker/files/initialize_local_ydb
@@ -8,6 +8,7 @@ export GRPC_TLS_PORT=${GRPC_TLS_PORT:-2135}
 export GRPC_PORT=${GRPC_PORT:-2136}
 export YDB_GRPC_TLS_DATA_PATH="/ydb_certs"
 export YDB_KAFKA_PROXY_PORT=${YDB_KAFKA_PROXY_PORT:-9092}
+export YDB_TINY_MODE="true"
 
 # Start local_ydb tool. Pass additional arguments for local_ydb
 /local_ydb deploy --ydb-working-dir /ydb_data --ydb-binary-path /ydbd --fixed-ports --dont-use-log-files "$@";
diff --git a/ydb/core/cms/console/configs_dispatcher.cpp b/ydb/core/cms/console/configs_dispatcher.cpp
@@ -896,6 +896,7 @@ try {
     TKikimrScopeId scopeId;
     TString tenantName;
     TBasicKikimrServicesMask servicesMask;
+    bool tinyMode;
     TString clusterName;
     NConfig::TConfigsDispatcherInitInfo configsDispatcherInitInfo;
 
@@ -905,9 +906,12 @@ try {
         scopeId,
         tenantName,
         servicesMask,
+        tinyMode,
         clusterName,
         configsDispatcherInitInfo);
 
+    Y_UNUSED(tinyMode);
+
     CandidateStartupConfig = appConfig;
     StartupConfigProcessError = false;
     StartupConfigProcessDiff = false;
diff --git a/ydb/core/config/init/init.h b/ydb/core/config/init/init.h
@@ -271,6 +271,7 @@ class IInitialConfigurator {
         TKikimrScopeId& scopeId,
         TString& tenantName,
         TBasicKikimrServicesMask& servicesMask,
+        bool& tinyMode,
         TString& clusterName,
         NConfig::TConfigsDispatcherInitInfo& configsDispatcherInitInfo) const = 0;
 };
@@ -330,6 +331,7 @@ class TInitialConfigurator {
         TKikimrScopeId& scopeId,
         TString& tenantName,
         TBasicKikimrServicesMask& servicesMask,
+        bool& tinyMode,
         TString& clusterName,
         TConfigsDispatcherInitInfo& configsDispatcherInitInfo) const
     {
@@ -339,6 +341,7 @@ class TInitialConfigurator {
             scopeId,
             tenantName,
             servicesMask,
+            tinyMode,
             clusterName,
             configsDispatcherInitInfo);
     }
diff --git a/ydb/core/config/init/init_impl.h b/ydb/core/config/init/init_impl.h
@@ -1412,6 +1412,7 @@ class TInitialConfiguratorImpl
         TKikimrScopeId& scopeId,
         TString& tenantName,
         TBasicKikimrServicesMask& servicesMask,
+        bool& tinyMode,
         TString& clusterName,
         TConfigsDispatcherInitInfo& configsDispatcherInitInfo) const override
     {
@@ -1420,6 +1421,7 @@ class TInitialConfiguratorImpl
         scopeId = ScopeId;
         tenantName = TenantName;
         servicesMask = ServicesMask;
+        tinyMode = CommonAppOptions.TinyMode;
         clusterName = ClusterName;
         configsDispatcherInitInfo.InitialConfig = appConfig;
         configsDispatcherInitInfo.StartupConfigYaml = appConfig.GetStartupConfigYaml();
diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp
@@ -36,6 +36,7 @@ int TClientCommandServer::Run(TConfig& config) {
         RunConfig.ScopeId,
         RunConfig.TenantName,
         RunConfig.ServicesMask,
+        RunConfig.TinyMode,
         RunConfig.ClusterName,
         RunConfig.ConfigsDispatcherInitInfo);
 
diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_validate_config.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_validate_config.cpp
@@ -50,6 +50,7 @@ NKikimrConfig::TAppConfig TransformConfig(const std::vector<TString>& args) {
     TKikimrScopeId scopeId;
     TString tenantName;
     TBasicKikimrServicesMask servicesMask;
+    bool tinyMode;
     TString clusterName;
     NConfig::TConfigsDispatcherInitInfo configsDispatcherInitInfo;
 
@@ -59,9 +60,12 @@ NKikimrConfig::TAppConfig TransformConfig(const std::vector<TString>& args) {
         scopeId,
         tenantName,
         servicesMask,
+        tinyMode,
         clusterName,
         configsDispatcherInitInfo);
 
+    Y_UNUSED(tinyMode);
+
     return appConfig;
 }
 
diff --git a/ydb/core/driver_lib/run/auto_config_initializer.cpp b/ydb/core/driver_lib/run/auto_config_initializer.cpp
@@ -39,6 +39,11 @@ namespace {
     constexpr i16 GRpcHandlersPerCompletionQueueInMaxPreparedCpuCase = 1000;
     constexpr i16 GRpcHandlersPerCompletionQueuePerCpu = GRpcHandlersPerCompletionQueueInMaxPreparedCpuCase / MaxPreparedCpuCount;
 
+    constexpr i16 SchedulerTinyCoresThreshold = 4;
+
+    constexpr ::arc_ui64 SchedulerDefaultResolution = 64;
+    constexpr ::arc_ui64 SchedulerTinyResolution = 1024;
+
     TShortPoolCfg ComputeCpuTable[MaxPreparedCpuCount + 1][5] {
         {  {0, 0},  {0, 0},   {0, 0}, {0, 0}, {0, 0} },     // 0
         {  {1, 1},  {0, 1},   {0, 1}, {0, 0}, {0, 0} },     // 1
@@ -227,7 +232,7 @@ namespace NKikimr::NAutoConfigInitializer {
         return servicePools;
     }
 
-    void ApplyAutoConfig(NKikimrConfig::TActorSystemConfig *config, bool isDynamicNode) {
+    void ApplyAutoConfig(NKikimrConfig::TActorSystemConfig *config, bool isDynamicNode, bool tinyMode) {
         config->SetUseAutoConfig(true);
         config->ClearExecutor();
 
@@ -239,7 +244,10 @@ namespace NKikimr::NAutoConfigInitializer {
 
         if (!config->HasScheduler()) {
             auto *scheduler = config->MutableScheduler();
-            scheduler->SetResolution(64);
+
+            bool useTiny = tinyMode || (cpuCount >= 1 && cpuCount <= SchedulerTinyCoresThreshold);
+            scheduler->SetResolution(useTiny ? SchedulerTinyResolution : SchedulerDefaultResolution);
+
             scheduler->SetSpinThreshold(0);
             scheduler->SetProgressThreshold(10'000);
         }
diff --git a/ydb/core/driver_lib/run/auto_config_initializer.h b/ydb/core/driver_lib/run/auto_config_initializer.h
@@ -80,7 +80,7 @@ namespace NKikimr::NAutoConfigInitializer {
 
     TMap<TString, ui32> GetServicePools(const NKikimrConfig::TActorSystemConfig &config, bool useAutoConfig);
 
-    void ApplyAutoConfig(NKikimrConfig::TActorSystemConfig *config, bool isDynamicNode);
+    void ApplyAutoConfig(NKikimrConfig::TActorSystemConfig *config, bool isDynamicNode, bool tinyMode);
 
     void ApplyAutoConfig(NKikimrConfig::TGRpcConfig *config, const NKikimrConfig::TActorSystemConfig &asConfig);
 
diff --git a/ydb/core/driver_lib/run/config.h b/ydb/core/driver_lib/run/config.h
@@ -23,6 +23,7 @@ struct TKikimrRunConfig {
 
     TString TenantName;
     TBasicKikimrServicesMask ServicesMask;
+    bool TinyMode = false;
 
     TString ClusterName;
 
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
@@ -276,6 +276,7 @@ IKikimrServicesInitializer::IKikimrServicesInitializer(const TKikimrRunConfig& r
     : Config(runConfig.AppConfig)
     , NodeId(runConfig.NodeId)
     , ScopeId(runConfig.ScopeId)
+    , TinyMode(runConfig.TinyMode)
 {}
 
 // TBasicServicesInitializer
@@ -506,7 +507,7 @@ void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* s
     bool useAutoConfig = !hasASCfg || NeedToUseAutoConfig(Config.GetActorSystemConfig());
     if (useAutoConfig) {
         bool isDynamicNode = appData->DynamicNameserviceConfig->MinDynamicNodeId <= NodeId;
-        NAutoConfigInitializer::ApplyAutoConfig(Config.MutableActorSystemConfig(), isDynamicNode);
+        NAutoConfigInitializer::ApplyAutoConfig(Config.MutableActorSystemConfig(), isDynamicNode, TinyMode);
     }
 
     Y_ABORT_UNLESS(Config.HasActorSystemConfig());
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.h b/ydb/core/driver_lib/run/kikimr_services_initializers.h
@@ -37,6 +37,7 @@ class IKikimrServicesInitializer : public IServiceInitializer {
     NKikimrConfig::TAppConfig& Config;
     const ui32                       NodeId;
     const TKikimrScopeId             ScopeId;
+    const bool                       TinyMode;
 
 public:
     IKikimrServicesInitializer(const TKikimrRunConfig& runConfig);
diff --git a/ydb/core/testlib/test_client.cpp b/ydb/core/testlib/test_client.cpp
@@ -600,7 +600,7 @@ namespace Tests {
         auto actorSystemConfig = Settings->AppConfig->GetActorSystemConfig();
         const bool useAutoConfig = actorSystemConfig.GetUseAutoConfig();
         if (useAutoConfig) {
-            NAutoConfigInitializer::ApplyAutoConfig(&actorSystemConfig, false);
+            NAutoConfigInitializer::ApplyAutoConfig(&actorSystemConfig, false, false);
         }
 
         TCpuManagerConfig cpuManager;
diff --git a/ydb/public/tools/lib/cmds/__init__.py b/ydb/public/tools/lib/cmds/__init__.py
@@ -257,6 +257,10 @@ def enable_tls():
     return os.getenv('YDB_GRPC_ENABLE_TLS') == 'true'
 
 
+def is_tiny_mode():
+    return os.getenv('YDB_TINY_MODE') == 'true'
+
+
 def report_monitoring_info():
     return os.getenv('YDB_REPORT_MONITORING_INFO') == 'true'
 
@@ -362,6 +366,9 @@ def deploy(arguments):
         for service in services:
             enabled_grpc_services.append(service)
 
+    if is_tiny_mode():
+        optionals['tiny_mode'] = True
+
     configuration = KikimrConfigGenerator(
         erasure=parse_erasure(arguments),
         binary_paths=[arguments.ydb_binary_path] if arguments.ydb_binary_path else None,
diff --git a/ydb/tests/library/harness/kikimr_config.py b/ydb/tests/library/harness/kikimr_config.py
@@ -180,6 +180,7 @@ def __init__(
             memory_controller_config=None,
             verbose_memory_limit_exception=False,
             enable_static_auth=False,
+            tiny_mode=False,
     ):
         if extra_feature_flags is None:
             extra_feature_flags = []
@@ -262,6 +263,8 @@ def __init__(
         self.yq_tenant = yq_tenant
         self.dc_mapping = dc_mapping
 
+        self.tiny_mode = tiny_mode
+
         self.__bs_cache_file_path = bs_cache_file_path
 
         self.yaml_config = _load_default_yaml(self.__node_ids, self.domain_name, self.static_erasure, self.__additional_log_configs)
diff --git a/ydb/tests/library/harness/kikimr_runner.py b/ydb/tests/library/harness/kikimr_runner.py
@@ -240,6 +240,9 @@ def __make_run_command(self):
         if self.__configurator.breakpad_minidumps_script:
             command.extend(["--breakpad-minidumps-script", self.__configurator.breakpad_minidumps_script])
 
+        if getattr(self.__configurator, "tiny_mode", False):
+            command.append("--tiny-mode")
+
         logger.info('CFG_DIR_PATH="%s"', self.__config_path)
         logger.info("Final command: %s", ' '.join(command).replace(self.__config_path, '$CFG_DIR_PATH'))
         return command
diff --git a/ydb/tests/library/harness/resources/default_yaml.yml b/ydb/tests/library/harness/resources/default_yaml.yml
@@ -117,7 +117,7 @@ actor_system_config:
     name: "IC"
     time_per_mailbox_micro_secs: 100
   scheduler:
-    resolution: 256
+    resolution: 1024
     spin_threshold: 0
     progress_threshold: 10000
   sys_executor: 0
