Move MaxTxInFly to separate config

Author: neyrox

ydb/core/base/appdata.cpp

@@ -81,6 +81,7 @@ struct TAppData::TImpl {
     NKikimrConfig::TStatisticsConfig StatisticsConfig;
     TMetricsConfig MetricsConfig;
     NKikimrConfig::TSystemTabletBackupConfig SystemTabletBackupConfig;
+    NKikimrConfig::TSystemTabletConfig SystemTabletConfig;
 };
 
 TAppData::TAppData(
@@ -147,6 +148,7 @@ TAppData::TAppData(
     , StatisticsConfig(Impl->StatisticsConfig)
     , MetricsConfig(Impl->MetricsConfig)
     , SystemTabletBackupConfig(Impl->SystemTabletBackupConfig)
+    , SystemTabletConfig(Impl->SystemTabletConfig)
     , KikimrShouldContinue(kikimrShouldContinue)
     , TracingConfigurator(MakeIntrusive<NJaegerTracing::TSamplingThrottlingConfigurator>(TimeProvider, RandomProvider))
 {}

ydb/core/base/appdata_fwd.h

@@ -81,6 +81,7 @@ namespace NKikimrConfig {
     class TBridgeConfig;
     class TStatisticsConfig;
     class TSystemTabletBackupConfig;
+    class TSystemTabletConfig;
 }
 
 namespace NKikimrReplication {
@@ -270,6 +271,7 @@ struct TAppData {
     NKikimrConfig::TStatisticsConfig& StatisticsConfig;
     TMetricsConfig& MetricsConfig;
     NKikimrConfig::TSystemTabletBackupConfig& SystemTabletBackupConfig;
+    NKikimrConfig::TSystemTabletConfig& SystemTabletConfig;
     bool EnforceUserTokenRequirement = false;
     bool EnforceUserTokenCheckRequirement = false; // check token if it was specified
     bool AllowHugeKeyValueDeletes = true; // delete when all clients limit deletes per request

ydb/core/driver_lib/run/run.cpp

@@ -1461,6 +1461,10 @@ void TKikimrRunner::InitializeAppData(const TKikimrRunConfig& runConfig)
         AppData->SystemTabletBackupConfig = runConfig.AppConfig.GetSystemTabletBackupConfig();
     }
 
+    if (runConfig.AppConfig.HasSystemTabletConfig()) {
+        AppData->SystemTabletConfig = runConfig.AppConfig.GetSystemTabletConfig();
+    }
+
     // setup resource profiles
     AppData->ResourceProfiles = new TResourceProfiles;
     if (runConfig.AppConfig.GetBootstrapConfig().ResourceProfilesSize())

ydb/core/protos/config.proto

@@ -2741,6 +2741,10 @@ message TSystemTabletBackupConfig {
     }
 }
 
+message TSystemTabletConfig {
+    optional uint64 MaxTxInFly = 1 [default = 10000];
+}
+
 message TAppConfig {
     option (NMarkers.Root) = true;
     optional TActorSystemConfig ActorSystemConfig = 1;
@@ -2848,6 +2852,7 @@ message TAppConfig {
     optional TStatisticsConfig StatisticsConfig = 113;
     optional TMetricsConfig MetricsConfig = 114;
     optional TSystemTabletBackupConfig SystemTabletBackupConfig = 115;
+    optional TSystemTabletConfig SystemTabletConfig = 116;
 }
 
 message TYdbVersion {

ydb/core/protos/memory_controller_config.proto

@@ -28,6 +28,4 @@ message TMemoryControllerConfig {
 
     optional float CompactionLimitPercent = 130 [default = 10];
     optional uint64 CompactionLimitBytes = 131;
-
-    optional uint64 MaxTxInFly = 132 [default = 10000];
 }

ydb/core/tablet_flat/flat_executor.cpp

@@ -133,7 +133,7 @@ TExecutor::TExecutor(
     , Time(TAppData::TimeProvider)
     , Owner(owner)
     , OwnerActorId(ownerActorId)
-    , MaxTxInFly(AppData()->MemoryControllerConfig.GetMaxTxInFly())
+    , MaxTxInFly(AppData()->SystemTabletConfig.GetMaxTxInFly())
     , Emitter(new TIdEmitter)
     , CounterEventsInFlight(new TEvTabletCounters::TInFlightCookie)
     , Stats(new TExecutorStatsImpl())

ydb/tests/library/harness/kikimr_config.py

@@ -186,7 +186,8 @@ def __init__(
             verbose_memory_limit_exception=False,
             enable_static_auth=False,
             cms_config=None,
-            explicit_statestorage_config=None
+            explicit_statestorage_config=None,
+            system_tablet_config=None,
     ):
         if extra_feature_flags is None:
             extra_feature_flags = []
@@ -470,6 +471,9 @@ def __init__(
         if memory_controller_config:
             self.yaml_config["memory_controller_config"] = memory_controller_config
 
+        if system_tablet_config:
+            self.yaml_config["system_tablet_config"] = system_tablet_config
+
         if os.getenv("YDB_HARD_MEMORY_LIMIT_BYTES"):
             if "memory_controller_config" not in self.yaml_config:
                 self.yaml_config["memory_controller_config"] = {}

ydb/tests/olap/test_overloads.py

@@ -110,7 +110,7 @@ def _setup_ydb_rp(cls):
         logger.info(yatest.common.execute([ydb_path, "-V"], wait=True).stdout.decode("utf-8"))
         config = KikimrConfigGenerator(
             extra_feature_flags={"enable_olap_reject_probability": True},
-            memory_controller_config={"max_tx_in_fly": 0},
+            system_tablet_config={"max_tx_in_fly": 0},
         )
         cls.cluster = KiKiMR(config)
         cls.cluster.start()