From aae4f85830c980f0d44b4db45419c2381b8d66ba Mon Sep 17 00:00:00 2001 From: abdosi <58047199+abdosi@users.noreply.github.com> Date: Fri, 29 May 2020 18:46:07 -0700 Subject: [PATCH] Make sure db_migrator is run after all config are loaded during (#926) load_minigraph. The behaviour got changed as part of multi-npu change so make it correct again. --- config/main.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/config/main.py b/config/main.py index 30fc4cd5c4b1..22dd494854ec 100755 --- a/config/main.py +++ b/config/main.py @@ -908,14 +908,19 @@ def load_minigraph(no_service_restart): run_command('{} pfcwd start_default'.format(ns_cmd_prefix), display_cmd=True) run_command("{} config qos reload".format(ns_cmd_prefix), display_cmd=True) - # Write latest db version string into db - db_migrator='/usr/bin/db_migrator.py' - if os.path.isfile(db_migrator) and os.access(db_migrator, os.X_OK): - run_command(db_migrator + ' -o set_version' + cfggen_namespace_option) - if os.path.isfile('/etc/sonic/acl.json'): run_command("acl-loader update full /etc/sonic/acl.json", display_cmd=True) - + + # Write latest db version string into db + db_migrator='/usr/bin/db_migrator.py' + if os.path.isfile(db_migrator) and os.access(db_migrator, os.X_OK): + for namespace in namespace_list: + if namespace is DEFAULT_NAMESPACE: + cfggen_namespace_option = " " + else: + cfggen_namespace_option = " -n {}".format(namespace) + run_command(db_migrator + ' -o set_version' + cfggen_namespace_option) + # We first run "systemctl reset-failed" to remove the "failed" # status from all services before we attempt to restart them if not no_service_restart: