Skip to content

[swssconfig] Optimize performance of swssconfig #2336

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
liat-grozovik merged 4 commits into from
Jun 24, 2022
Merged

[swssconfig] Optimize performance of swssconfig #2336

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
556d703
[swssconfig] Optimize performance of swssconfig
Junchao-Mellanox Jun 15, 2022
ba88348
Fix review comment
Junchao-Mellanox Jun 17, 2022
80021b5
Fix review comment
Junchao-Mellanox Jun 18, 2022
4933c51
Merge remote-tracking branch 'origin/master' into optimize-swssconfig
Junchao-Mellanox Jun 20, 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
12 changes: 8 additions & 4 deletions swssconfig/swssconfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ void dump_db_item(KeyOpFieldsValuesTuple &db_item)

bool write_db_data(vector<KeyOpFieldsValuesTuple> &db_items)
{
DBConnector db("APPL_DB", 0, true);
DBConnector db("APPL_DB", 0, false);
RedisPipeline pipeline(&db); // dtor of RedisPipeline will automatically flush data
unordered_map<string, ProducerStateTable> table_map;

for (auto &db_item : db_items)
{
dump_db_item(db_item);
Expand All @@ -55,18 +58,19 @@ bool write_db_data(vector<KeyOpFieldsValuesTuple> &db_items)
}
string table_name = key.substr(0, pos);
string key_name = key.substr(pos + 1);
ProducerStateTable producer(&db, table_name);
auto ret = table_map.emplace(std::piecewise_construct, std::forward_as_tuple(table_name), std::forward_as_tuple(&pipeline, table_name, true));

if (kfvOp(db_item) == SET_COMMAND)
producer.set(key_name, kfvFieldsValues(db_item), SET_COMMAND);
ret.first->second.set(key_name, kfvFieldsValues(db_item), SET_COMMAND);
else if (kfvOp(db_item) == DEL_COMMAND)
producer.del(key_name, DEL_COMMAND);
ret.first->second.del(key_name, DEL_COMMAND);
else
{
SWSS_LOG_ERROR("Invalid operation: %s\n", kfvOp(db_item).c_str());
return false;
}
}

return true;
}

Expand Down