Skip to content

Commit 5cd6bc4

Browse files
[portconfig]: Remove try block for db config initialization (sonic-net#10581)
Why I did it Provide fix for comment: https://github.com/Azure/sonic-buildimage/pull/10475/files#r847753187; How I did it Try exception is not required in this scenario, so remove and modify to initial db config according to single or multi-asic platforms. How to verify it Verified on multi-asic device.
1 parent 869ac1d commit 5cd6bc4

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/sonic-config-engine/portconfig.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,7 @@ def db_connect_configdb(namespace=None):
7272
"""
7373
Connect to configdb
7474
"""
75-
try:
76-
if namespace is not None:
77-
swsscommon.SonicDBConfig.load_sonic_global_db_config(namespace=namespace)
78-
config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
79-
except Exception as e:
80-
return None
75+
config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
8176
if config_db is None:
8277
return None
8378
try:

src/sonic-config-engine/sonic-cfggen

+7-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ from functools import partial
3232
from minigraph import minigraph_encoder, parse_xml, parse_device_desc_xml, parse_asic_sub_role, parse_asic_switch_type
3333
from portconfig import get_port_config, get_breakout_mode
3434
from redis_bcc import RedisBytecodeCache
35-
from sonic_py_common.multi_asic import get_asic_id_from_name, get_asic_device_id
35+
from sonic_py_common.multi_asic import get_asic_id_from_name, get_asic_device_id, is_multi_asic
3636
from sonic_py_common import device_info
3737
from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector
3838

@@ -309,6 +309,12 @@ def main():
309309
'localhost': {'namespace_id': namespace_id}
310310
}
311311
})
312+
# load db config
313+
if not SonicDBConfig.isInit():
314+
if is_multi_asic():
315+
SonicDBConfig.load_sonic_global_db_config(namespace=asic_name)
316+
else:
317+
SonicDBConfig.load_sonic_db_config()
312318
if hwsku is not None:
313319
hardware_data = {'DEVICE_METADATA': {'localhost': {
314320
'hwsku': hwsku

0 commit comments

Comments
 (0)