From 66c96eaf4c7c8d8649ca7d00db58b9b998048d09 Mon Sep 17 00:00:00 2001
From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com>
Date: Fri, 6 May 2022 11:12:56 -0700
Subject: [PATCH] Revert "[portconfig]: Remove try block for db config
 initialization (#10581)" (#10756)

This reverts commit 5cd6bc4ce2a32bd7b1b71dbcc85e7390799da7d0.
---
 src/sonic-config-engine/portconfig.py | 7 ++++++-
 src/sonic-config-engine/sonic-cfggen  | 8 +-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/sonic-config-engine/portconfig.py b/src/sonic-config-engine/portconfig.py
index ea9985a3beb0..0c056d1cdab7 100644
--- a/src/sonic-config-engine/portconfig.py
+++ b/src/sonic-config-engine/portconfig.py
@@ -72,7 +72,12 @@ def db_connect_configdb(namespace=None):
     """
     Connect to configdb
     """
-    config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
+    try:
+        if namespace is not None:
+            swsscommon.SonicDBConfig.load_sonic_global_db_config(namespace=namespace)
+        config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
+    except Exception as e:
+        return None
     if config_db is None:
         return None
     try:
diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen
index 3f0e047f76fa..bf93ad849fcb 100755
--- a/src/sonic-config-engine/sonic-cfggen
+++ b/src/sonic-config-engine/sonic-cfggen
@@ -32,7 +32,7 @@ from functools import partial
 from minigraph import minigraph_encoder, parse_xml, parse_device_desc_xml, parse_asic_sub_role, parse_asic_switch_type
 from portconfig import get_port_config, get_breakout_mode
 from redis_bcc import RedisBytecodeCache
-from sonic_py_common.multi_asic import get_asic_id_from_name, get_asic_device_id, is_multi_asic
+from sonic_py_common.multi_asic import get_asic_id_from_name, get_asic_device_id
 from sonic_py_common import device_info
 from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector
 
@@ -296,12 +296,6 @@ def main():
                                 'localhost': {'namespace_id': namespace_id}
                              }
                           })
-    # load db config
-    if not SonicDBConfig.isInit():
-        if is_multi_asic():
-            SonicDBConfig.load_sonic_global_db_config(namespace=asic_name)
-        else:
-            SonicDBConfig.load_sonic_db_config()
     if hwsku is not None:
         hardware_data = {'DEVICE_METADATA': {'localhost': {
             'hwsku': hwsku