Skip to content

Change DBConnector to connect redis with unix socket. #21345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiluo-msft merged 8 commits into from
Jan 10, 2025
Merged

Change DBConnector to connect redis with unix socket. #21345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c98b591
Update main.py
liuh-80 Jan 7, 2025
8abb71d
Update multi_asic.py
liuh-80 Jan 7, 2025
a335067
Update sfputil.py
liuh-80 Jan 7, 2025
90a9081
Update daemon_base.py
liuh-80 Jan 7, 2025
cee1e5f
Update port_index_mapper.py
liuh-80 Jan 7, 2025
9ff65f3
Update runner.py
liuh-80 Jan 7, 2025
887c563
Update eventd.cpp
liuh-80 Jan 7, 2025
edb64f7
Change DBConnector parameter to True
liuh-80 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dockers/docker-sflow/port_index_mapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def __init__(self):
swsscommon.STATE_VLAN_TABLE_NAME]
self.appl_db = swsscommon.DBConnector("STATE_DB",
REDIS_TIMEOUT_MS,
True)
False)

self.state_db = swsscommon.SonicV2Connector(host='127.0.0.1', decode_responses=True)
self.state_db.connect(self.state_db.STATE_DB, False)
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-bgpcfgd/bgpcfgd/runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def add_manager(self, manager):
db = swsscommon.SonicDBConfig.getDbId(db_name)
if db not in self.db_connectors:
if db_name == "CHASSIS_APP_DB":
self.db_connectors[db] = swsscommon.DBConnector(db_name, 0, True, '')
self.db_connectors[db] = swsscommon.DBConnector(db_name, 0, False, '')
else:
self.db_connectors[db] = swsscommon.DBConnector(db_name, 0)

Expand Down
6 changes: 3 additions & 3 deletions src/sonic-bgpcfgd/staticroutebfd/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ def __init__(self):
#assume only one ipv4 and/or one ipv6 for each interface
self.local_db[LOCAL_INTERFACE_TABLE] = defaultdict(dict)

self.config_db = swsscommon.DBConnector(CONFIG_DB_NAME, 0, True)
self.appl_db = swsscommon.DBConnector(APPL_DB_NAME, 0, True)
self.state_db = swsscommon.DBConnector(STATE_DB_NAME, 0, True)
self.config_db = swsscommon.DBConnector(CONFIG_DB_NAME, 0, False)
self.appl_db = swsscommon.DBConnector(APPL_DB_NAME, 0, False)
self.state_db = swsscommon.DBConnector(STATE_DB_NAME, 0, False)

self.bfd_appl_tbl = swsscommon.ProducerStateTable(self.appl_db, BFD_SESSION_TABLE_NAME)

Expand Down
2 changes: 1 addition & 1 deletion src/sonic-eventd/src/eventd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ stats_collector::start()

if (!s_unit_testing) {
try {
m_counters_db = make_shared<swss::DBConnector>("COUNTERS_DB", 0, true);
m_counters_db = make_shared<swss::DBConnector>("COUNTERS_DB", 0, false);
}
catch (exception &e)
{
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-py-common/sonic_py_common/daemon_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

def db_connect(db_name, namespace=EMPTY_NAMESPACE):
from swsscommon import swsscommon
return swsscommon.DBConnector(db_name, REDIS_TIMEOUT_MSECS, True, namespace)
return swsscommon.DBConnector(db_name, REDIS_TIMEOUT_MSECS, False, namespace)


#
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-py-common/sonic_py_common/multi_asic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ def get_asic_presence_list():
# This is supervisor card. Some fabric cards may not be inserted.
# Get asic list from CHASSIS_ASIC_TABLE which lists only the asics
# present based on Fabric card detection by the platform.
db = swsscommon.DBConnector(CHASSIS_STATE_DB, 0, True)
db = swsscommon.DBConnector(CHASSIS_STATE_DB, 0, False)
asic_table = swsscommon.Table(db, CHASSIS_FABRIC_ASIC_INFO_TABLE)
if asic_table:
asics_presence_list = list(asic_table.getKeys())
Expand Down