From 506b694256aa255413cc621262e24a0d59b07a2a Mon Sep 17 00:00:00 2001 From: Yun Li Date: Thu, 3 Nov 2022 06:16:43 +0000 Subject: [PATCH] Fix code irregular issues Signed-off-by: Yun Li --- src/sonic-ctrmgrd/ctrmgr/container_startup.py | 10 ---------- src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py | 8 +++++--- src/sonic-ctrmgrd/ctrmgr/kube_commands.py | 2 -- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/sonic-ctrmgrd/ctrmgr/container_startup.py b/src/sonic-ctrmgrd/ctrmgr/container_startup.py index 13ce01ff1ead..c22ceb2f9ce5 100755 --- a/src/sonic-ctrmgrd/ctrmgr/container_startup.py +++ b/src/sonic-ctrmgrd/ctrmgr/container_startup.py @@ -28,7 +28,6 @@ def debug_msg(m): msg = "{}: {}".format(inspect.stack()[1][3], m) - print(msg) syslog.syslog(syslog.LOG_DEBUG, msg) @@ -232,15 +231,6 @@ def container_up(feature, owner, version): do_freeze(feature, "This version is marked disabled. Exiting ...") return - # if not instance_higher(feature, state_data[VERSION], version): - # # TODO: May Remove label __enabled - # # Else kubelet will continue to re-deploy every 5 mins, until - # # master removes the lable to un-deploy. - # # - # do_freeze(feature, "bail out as current deploy version {} is not higher". - # format(version)) - # return - update_data(state_db, feature, { VERSION: version }) mode = state_data[REMOTE_STATE] diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py index 6be18146b2aa..6b473dd4ee98 100755 --- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py +++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py @@ -101,7 +101,6 @@ def log_debug(m): msg = "{}: {}".format(inspect.stack()[1][3], m) - #print(msg) syslog.syslog(syslog.LOG_DEBUG, msg) @@ -176,7 +175,7 @@ def register_db(self, db_name): self.db_connectors[db_name] = swsscommon.DBConnector(db_name, 0) - def register_timer(self, ts, handler, args=()): + def register_timer(self, ts, handler, args=None): """ Register timer based handler. The handler will be called on/after give timestamp, ts """ @@ -239,7 +238,10 @@ def run(self): lst = self.timer_handlers[k] del self.timer_handlers[k] for fn in lst: - fn[0](*fn[1]) + if fn[1] == None: + fn[0]() + else: + fn[0](*fn[1]) else: timeout = (k - ct_ts).seconds break diff --git a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py index 91415390ccd5..783f122ec914 100755 --- a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py +++ b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py @@ -337,8 +337,6 @@ def _do_join(server, port, insecure): out = "" ret = 0 try: - #local_ipv6 = _get_local_ipv6() - #_download_file(server, port, insecure) _gen_cli_kubeconf(server, port, insecure) _do_reset(True) _run_command("modprobe br_netfilter")