Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 orchagent/dash/dashvnetorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ void DashVnetOrch::addPaValidation(const string& key, VnetMapBulkContext& ctxt)
string underlay_ip_str = to_string(ctxt.metadata.underlay_ip());
string pa_ref_key = ctxt.vnet_name + ":" + underlay_ip_str;

auto vnet_underlay_ips = vnet_table_[ctxt.vnet_name].underlay_ips;
auto& vnet_underlay_ips = vnet_table_[ctxt.vnet_name].underlay_ips;
std::string underlay_sip_str = to_string(ctxt.metadata.underlay_ip());
if (vnet_underlay_ips.find(underlay_sip_str) != vnet_underlay_ips.end())
{
Expand Down
11 changes: 4 additions & 7 deletions orchagent/zmqorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,11 @@ void ZmqConsumer::execute()
{
SWSS_LOG_ENTER();

size_t update_size = 0;
auto table = static_cast<swss::ZmqConsumerStateTable*>(getSelectable());
do
{
std::deque<KeyOpFieldsValuesTuple> entries;
table->pops(entries);
update_size = addToSync(entries);
} while (update_size != 0);

std::deque<KeyOpFieldsValuesTuple> entries;
table->pops(entries);
addToSync(entries);

drain();
}
Expand Down
Loading