Merge 0dd107b into ec22f24

ydb-platform · May 19, 2024 · e77fbef · e77fbef
2 parents ec22f24 + 0dd107b
commit e77fbef
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 29 deletions.
diff --git a/ydb/tools/cfg/static.py b/ydb/tools/cfg/static.py
@@ -50,7 +50,6 @@ def __init__(
         cfg_home="/Berkanavt/kikimr",
         sqs_port=8771,
         enable_cores=False,
-        enable_cms_config_cache=False,
         local_binary_path=None,
         skip_location=False,
         schema_validator=None,
@@ -113,7 +112,6 @@ def __init__(
                 "pdisk_key.txt",
             )
         )
-        self._enable_cms_config_cache = template.get("enable_cms_config_cache", enable_cms_config_cache)
         tracing = template.get("tracing_config")
         if tracing is not None:
             self.__tracing = (
@@ -294,7 +292,6 @@ def kikimr_cfg(self):
                 self.__cluster_details.default_log_level,
                 mon_address=self.__cluster_details.monitor_address,
                 cert_params=self.__cluster_details.ic_cert_params,
-                enable_cms_config_cache=self._enable_cms_config_cache,
                 rb_txt_enabled=self.rb_txt_enabled,
                 metering_txt_enabled=self.metering_txt_enabled,
                 audit_txt_enabled=self.audit_txt_enabled,
@@ -1340,5 +1337,5 @@ def dynamic_server_common_args(self):
         if self.__cluster_details.use_new_style_kikimr_cfg:
             return dynamic_cfg_new_style(self._enable_cores)
         return kikimr_cfg_for_dynamic_slot(
-            self._enable_cores, self._enable_cms_config_cache, cert_params=self.__cluster_details.ic_cert_params
+            self._enable_cores, cert_params=self.__cluster_details.ic_cert_params
         )
diff --git a/ydb/tools/cfg/templates.py b/ydb/tools/cfg/templates.py
@@ -340,22 +340,6 @@ def yql_arguments(yql_txt_enabled=False):
     )
 
 
-def cms_config_cache_argument_for_dynamic_nodes(enable_cms_config_cache=False):
-    return (
-        ''
-        if not enable_cms_config_cache
-        else 'kikimr_arg="${kikimr_arg} --cms-config-cache-file ${kikimr_home}_${kikimr_ic_port}/cache/cached_cfg.txt"'
-    )
-
-
-def cms_config_cache_argument_for_static_nodes(enable_cms_config_cache=False):
-    return (
-        ''
-        if not enable_cms_config_cache
-        else 'kikimr_arg="${kikimr_arg} --cms-config-cache-file ${kikimr_home}/cache/cached_cfg.txt"'
-    )
-
-
 def mbus_arguments(enable_mbus=False):
     return (
         []
@@ -426,7 +410,6 @@ def kikimr_cfg_for_static_node(
     kikimr_binaries_base_path='/Berkanavt/kikimr',
     mon_address="",
     cert_params=None,
-    enable_cms_config_cache=False,
     rb_txt_enabled=False,
     metering_txt_enabled=False,
     audit_txt_enabled=False,
@@ -466,7 +449,6 @@ def kikimr_cfg_for_static_node(
         + metering_arguments(metering_txt_enabled)
         + audit_arguments(audit_txt_enabled)
         + yql_arguments(yql_txt_enabled)
-        + ([cms_config_cache_argument_for_static_nodes(enable_cms_config_cache)] if enable_cms_config_cache else [])
         + mbus_arguments(mbus_enabled)
     )
 
@@ -484,7 +466,6 @@ def kikimr_cfg_for_dynamic_node(
     kikimr_binaries_base_path='/Berkanavt/kikimr',
     mon_address="",
     cert_params=None,
-    enable_cms_config_cache=False,
     rb_txt_enabled=False,
     metering_txt_enabled=False,
     audit_txt_enabled=False,
@@ -522,7 +503,6 @@ def kikimr_cfg_for_dynamic_node(
         + rb_arguments(rb_txt_enabled)
         + metering_arguments(metering_txt_enabled)
         + audit_arguments(audit_txt_enabled)
-        + ([cms_config_cache_argument_for_dynamic_nodes(enable_cms_config_cache)] if enable_cms_config_cache else [])
     )
 
 
@@ -544,7 +524,6 @@ def expected_vars(**kwargs):
 
 def kikimr_cfg_for_dynamic_slot(
     enable_cores=False,
-    enable_cms_config_cache=False,
     cert_params=None,
     rb_txt_enabled=False,
     metering_txt_enabled=False,
@@ -583,5 +562,4 @@ def kikimr_cfg_for_dynamic_slot(
         + metering_arguments(metering_txt_enabled)
         + audit_arguments(audit_txt_enabled)
         + yql_arguments(yql_txt_enabled)
-        + ([cms_config_cache_argument_for_dynamic_nodes(enable_cms_config_cache)] if enable_cms_config_cache else [])
     )
diff --git a/ydb/tools/cfg/validation.py b/ydb/tools/cfg/validation.py
@@ -970,9 +970,6 @@
         "nw_cache_file_path": {
             "type": "string",
         },
-        "enable_cms_config_cache": {
-            "type": "boolean",
-        },
         "hosts": {
             "type": "array",
             "items": copy.deepcopy(HOST_SCHEMA),