Skip to content
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

Fix deadlock in rib_flush on reload config #134

Merged
merged 1 commit into from
Mar 4, 2024
Merged

Fix deadlock in rib_flush on reload config #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 7 deletions controlplane/rib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,10 +562,9 @@ void rib_t::rib_eor(const common::icp::rib_update::eor& request)

void rib_t::rib_flush(bool force_flush)
{
std::lock_guard<std::mutex> rib_update_guard(rib_update_mutex);

bool flush;
{
std::lock_guard<std::mutex> rib_update_guard(rib_update_mutex);
std::lock_guard<std::mutex> prefixes_guard(prefixes_mutex);
std::lock_guard<std::mutex> prefixes_rebuild_guard(prefixes_rebuild_mutex);

Expand Down Expand Up @@ -594,18 +593,17 @@ void rib_t::rib_flush(bool force_flush)
}
}

flush = prefixes_reb.size();
flush = force_flush || prefixes_reb.size();
prefixes_reb.clear();

need_flushing = false;
}

if (force_flush ||
flush)
if (flush)
{
controlPlane->route.prefix_flush();
controlPlane->dregress.prefix_flush();
}

need_flushing = false;
}

common::icp::rib_summary::response rib_t::rib_summary()
Expand Down
Loading