Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove cms-config-cache option from configurator #4665

Merged
merged 1 commit into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ydb/tools/cfg/static.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
)
22 changes: 0 additions & 22 deletions ydb/tools/cfg/templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
[]
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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)
)

Expand All @@ -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,
Expand Down Expand Up @@ -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 [])
)


Expand All @@ -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,
Expand Down Expand Up @@ -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 [])
)
3 changes: 0 additions & 3 deletions ydb/tools/cfg/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -970,9 +970,6 @@
"nw_cache_file_path": {
"type": "string",
},
"enable_cms_config_cache": {
"type": "boolean",
},
"hosts": {
"type": "array",
"items": copy.deepcopy(HOST_SCHEMA),
Expand Down
Loading