From 06e02b73c7c1ec20d6594cdc792c5643cdd06b5f Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Fri, 19 Feb 2021 08:09:40 -0700 Subject: [PATCH] cephadm: blank line contains whitespace (W293) Signed-off-by: Michael Fritch --- src/cephadm/cephadm | 56 ++++++++++++++++++++++----------------------- src/cephadm/tox.ini | 1 - 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index f84eee9ab5af1..00f9492eaddbd 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -3268,7 +3268,7 @@ def check_subnet(subnets: str) -> Tuple[int, List[int], str]: except ValueError as e: rc = 1 errors.append(f"{subnet} invalid: {str(e)}") - + return rc, list(versions), ", ".join(errors) @@ -3367,7 +3367,7 @@ def prepare_mon_addresses( if not mon_network: raise Error('Failed to infer CIDR network for mon ip %s; pass ' '--skip-mon-network to configure it later' % base_ip) - + return (addr_arg, ipv6, mon_network) @@ -3792,7 +3792,7 @@ def finish_bootstrap_config( if mon_network: logger.info(f"Setting mon public_network to {mon_network}") cli(['config', 'set', 'mon', 'public_network', mon_network]) - + if cluster_network: logger.info(f"Setting cluster_network to {cluster_network}") cli(['config', 'set', 'global', 'cluster_network', cluster_network]) @@ -4208,12 +4208,12 @@ def command_deploy(ctx): if not daemon_ports: logger.info("cephadm-exporter will use default port ({})".format(CephadmDaemon.default_port)) daemon_ports = [CephadmDaemon.default_port] - + CephadmDaemon.validate_config(config_js) - + deploy_daemon(ctx, ctx.fsid, daemon_type, daemon_id, None, uid, gid, ports=daemon_ports) - + else: raise Error('daemon type {} not implemented in command_deploy function' .format(daemon_type)) @@ -6376,7 +6376,7 @@ class HostFacts(): if ret: return ret - + return { "type": "None", "description": "Linux Security Module framework is not available" @@ -6453,7 +6453,7 @@ class CephadmCache: self.daemons = {} self.host = {} self.lock = RLock() - + @property def health(self): return { @@ -6510,7 +6510,7 @@ class CephadmDaemonHandler(BaseHTTPRequestHandler): @classmethod def authorize(cls, f): """Implement a basic token check. - + The token is installed at deployment time and must be provided to ensure we only respond to callers who know our token i.e. mgr """ @@ -6521,7 +6521,7 @@ class CephadmDaemonHandler(BaseHTTPRequestHandler): return f(self, *args, **kwargs) return wrapper - + def _help_page(self): return """ @@ -6622,7 +6622,7 @@ td,th {{ self.send_header('Content-type', 'application/json') self.end_headers() self.wfile.write(json.dumps({"message": bad_request_msg}).encode('utf-8')) - + def log_message(self, format, *args): rqst = " ".join(str(a) for a in args) logger.info(f"client:{self.address_string()} [{self.log_date_time_string()}] {rqst}") @@ -6666,7 +6666,7 @@ class CephadmDaemon(): if not config or not all([k_name in config for k_name in CephadmDaemon.config_requirements]): raise Error(f"config must contain the following fields : {reqs}") - + if not all([isinstance(config[k_name], str) for k_name in CephadmDaemon.config_requirements]): errors.append(f"the following fields must be strings: {reqs}") @@ -6688,7 +6688,7 @@ class CephadmDaemon(): raise ValueError except (TypeError, ValueError): errors.append("port must be an integer > 1024") - + if errors: raise Error("Parameter errors : {}".format(", ".join(errors))) @@ -6753,7 +6753,7 @@ class CephadmDaemon(): exception_encountered = False while True: - + if self.stop or exception_encountered: break @@ -6786,7 +6786,7 @@ class CephadmDaemon(): } ) logger.debug(f"completed host-facts scrape - {elapsed}s") - + time.sleep(CephadmDaemon.loop_delay) ctr += CephadmDaemon.loop_delay logger.info("host-facts thread stopped") @@ -6844,11 +6844,11 @@ class CephadmDaemon(): "data": data, } ) - + logger.debug(f"completed ceph-volume scrape - {elapsed}s") time.sleep(CephadmDaemon.loop_delay) ctr += CephadmDaemon.loop_delay - + logger.info("ceph-volume thread stopped") def _scrape_list_daemons(self, refresh_interval=20): @@ -6857,13 +6857,13 @@ class CephadmDaemon(): while True: if self.stop or exception_encountered: break - + if ctr >= refresh_interval: ctr = 0 logger.debug("executing list-daemons scrape") errors = [] s_time = time.time() - + try: # list daemons should ideally be invoked with a fsid data = list_daemons(self.ctx) @@ -6886,7 +6886,7 @@ class CephadmDaemon(): } ) logger.debug(f"completed list-daemons scrape - {elapsed}s") - + time.sleep(CephadmDaemon.loop_delay) ctr += CephadmDaemon.loop_delay logger.info("list-daemons thread stopped") @@ -6910,7 +6910,7 @@ class CephadmDaemon(): def reload(self, *args): """reload -HUP received - + This is a placeholder function only, and serves to provide the hook that could be exploited later if the exporter evolves to incorporate a config file """ @@ -6937,7 +6937,7 @@ class CephadmDaemon(): host_facts = self._create_thread(self._scrape_host_facts, 'host', 5) self.workers.append(host_facts) - + daemons = self._create_thread(self._scrape_list_daemons, 'daemons', 20) self.workers.append(daemons) @@ -6954,7 +6954,7 @@ class CephadmDaemon(): self.http_server.token = self.token server_thread = self._create_thread(self.http_server.serve_forever, 'http_server') logger.info(f"https server listening on {self.http_server.server_address[0]}:{self.http_server.server_port}") - + ctr = 0 while server_thread.is_alive(): if self.stop: @@ -6974,10 +6974,10 @@ class CephadmDaemon(): ctr += CephadmDaemon.loop_delay logger.info("Main http server thread stopped") - + @property def unit_run(self): - + return """set -e {py3} {bin_path} exporter --fsid {fsid} --id {daemon_id} --port {port} &""".format( py3=shutil.which('python3'), @@ -7050,7 +7050,7 @@ WantedBy=ceph-{fsid}.target os.rename( os.path.join(self.ctx.unit_dir, f"{self.unit_name}.new"), os.path.join(self.ctx.unit_dir, self.unit_name)) - + call_throws(self.ctx, ['systemctl', 'daemon-reload']) call(self.ctx, ['systemctl', 'stop', self.unit_name], verbosity=CallVerbosity.DEBUG) @@ -7102,7 +7102,7 @@ def command_exporter(ctx: CephadmContext): if ctx.fsid not in os.listdir(ctx.data_dir): raise Error(f"cluster fsid '{ctx.fsid}' not found in '{ctx.data_dir}'") - + exporter.run() ################################## @@ -7125,7 +7125,7 @@ def command_maintenance(ctx: CephadmContext): raise Error('must pass --fsid to specify cluster') target = f"ceph-{ctx.fsid}.target" - + if ctx.maintenance_action.lower() == 'enter': logger.info("Requested to place host into maintenance") if systemd_target_state(target): diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini index e3365174d7678..8650076998fb3 100644 --- a/src/cephadm/tox.ini +++ b/src/cephadm/tox.ini @@ -6,7 +6,6 @@ skipsdist=true max-line-length = 100 ignore = E501, - W293, W503, W504, exclude = -- 2.39.5