Skip to content

Add API endpoints to ConfigDBConnector to support pre-loading data without blackout #587

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
merged 8 commits into from
Mar 30, 2022
Merged

Add API endpoints to ConfigDBConnector to support pre-loading data without blackout #587

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ab5d1d
Add infra to allow consumers of ConfigDBConnector to load table data …
alexrallen Feb 23, 2022
a75c233
Add explanatory comment
alexrallen Feb 25, 2022
ce9b471
Respond to review feedback and refactor
alexrallen Mar 16, 2022
898554e
respond to review feedback
alexrallen Mar 24, 2022
6cda60d
Invalidate cache on any hit
alexrallen Mar 24, 2022
980ccd8
Fix cache logic
alexrallen Mar 24, 2022
53d3f03
Optimize a bit
alexrallen Mar 24, 2022
3216388
Fix unit test
alexrallen Mar 30, 2022
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
15 changes: 13 additions & 2 deletions common/configdb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,16 @@ class ConfigDBConnector_Native : public SonicV2Connector_Native
return self.getDbName()

## Note: callback is difficult to implement by SWIG C++, so keep in python
def listen(self):
## Start listen Redis keyspace events and will trigger corresponding handlers when content of a table changes.
def listen(self, init=None):
## Start listen Redis keyspace event. Pass a callback function to `init` to handle initial table data.
self.pubsub = self.get_redis_client(self.db_name).pubsub()
self.pubsub.psubscribe("__keyspace@{}__:*".format(self.get_dbid(self.db_name)))

init_data = {}
if init:
init_data = {tbl: self.get_table(tbl) for tbl, cb in self.handlers.items()}
init(init_data)

while True:
item = self.pubsub.listen_message()
if item['type'] == 'pmessage':
Expand All @@ -84,6 +90,11 @@ class ConfigDBConnector_Native : public SonicV2Connector_Native
if table in self.handlers:
client = self.get_redis_client(self.db_name)
data = self.raw_to_typed(client.hgetall(key))
if table in init_data and row in init_data[table]:
if init_data[table][row] == data:
continue
else:
del init_data[table][row]
self.__fire(table, row, data)
except ValueError:
pass #Ignore non table-formated redis entries
Expand Down