RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56178 from adk3798/cephadm-pub-net-config-check-out-of-date

Browse Source 
mgr/cephadm: refresh public_network for config checks before checking

Reviewed-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
Adam King 2024-03-19 14:04:51 -04:00 committed by GitHub
commit c64bb8f50e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pybind/mgr/cephadm/configchecks.py
View File

@ -674,7 +674,7 @@ class CephadmConfigChecks:
self.host_to_role[hostname] = list(self.mgr.cache.get_daemon_types(hostname))
def run_checks(self) -> None:
checks_enabled = self.mgr.get_module_option('config_checks_enabled')
checks_enabled = self.mgr.config_checks_enabled
if checks_enabled is not True:
return

3
src/pybind/mgr/cephadm/module.py
View File

@ -567,6 +567,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
self.registry_password: Optional[str] = None
self.registry_insecure: bool = False
self.use_repo_digest = True
self.config_checks_enabled = False
self.default_registry = ''
self.autotune_memory_target_ratio = 0.0
self.autotune_interval = 0
@ -1389,7 +1390,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
@orchestrator._cli_read_command('cephadm config-check status')
def _config_check_status(self) -> HandleCommandResult:
"""Show whether the configuration checker feature is enabled/disabled"""
status = self.get_module_option('config_checks_enabled')
status = self.config_checks_enabled
return HandleCommandResult(stdout="Enabled" if status else "Disabled")
@orchestrator._cli_write_command('cephadm config-check enable')

5
src/pybind/mgr/cephadm/serve.py
View File

@ -67,7 +67,6 @@ class CephadmServe:
of cephadm. This loop will then attempt to apply this new state.
"""
self.log.debug("serve starting")
self.mgr.config_checker.load_network_config()
while self.mgr.run:
self.log.debug("serve loop start")
@ -322,7 +321,9 @@ class CephadmServe:
self.mgr.agent_helpers._update_agent_down_healthcheck(agents_down)
self.mgr.http_server.config_update()
self.mgr.config_checker.run_checks()
if self.mgr.config_checks_enabled:
self.mgr.config_checker.load_network_config()
self.mgr.config_checker.run_checks()
for k in [
'CEPHADM_HOST_CHECK_FAILED',

5
src/pybind/mgr/cephadm/tests/test_configchecks.py
View File

@ -238,6 +238,7 @@ class FakeMgr:
self.default_version = 'quincy'
self.version_overrides = {}
self.daemon_to_host = {}
self.config_checks_enabled = True
self.cache = HostCache(self)
self.upgrade = CephadmUpgrade(self)
@ -623,9 +624,7 @@ class TestConfigCheck:
assert 'ceph_release' in checker.skipped_checks
def test_skip_when_disabled(self, mgr):
mgr.module_option.update({
"config_checks_enabled": "false"
})
mgr.config_checks_enabled = False
checker = CephadmConfigChecks(mgr)
checker.cluster_network_list = []
checker.public_network_list = ['10.9.64.0/24']