Skip to content

Fix data race in on_switch_shutdown_request() #2931

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
prsunny merged 2 commits into from
Oct 13, 2023
Merged

Fix data race in on_switch_shutdown_request() #2931

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6952be9
Fix data race in on_switch_shutdown_request()
Yakiv-Huryk Oct 5, 2023
6a5d3f8
Merge branch 'master' into switch_shutdown_data_race
dgsudharsan Oct 13, 2023
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
17 changes: 16 additions & 1 deletion orchagent/notifications.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ extern "C" {
#include "logger.h"
#include "notifications.h"

#ifdef ASAN_ENABLED
#include <sanitizer/lsan_interface.h>
#endif

void on_fdb_event(uint32_t count, sai_fdb_event_notification_data_t *data)
{
// don't use this event handler, because it runs by libsairedis in a separate thread
Expand All @@ -30,5 +34,16 @@ void on_switch_shutdown_request(sai_object_id_t switch_id)
/* TODO: Later a better restart story will be told here */
SWSS_LOG_ERROR("Syncd stopped");

exit(EXIT_FAILURE);
/*
The quick_exit() is used instead of the exit() to avoid a following data race:
* the exit() calls the destructors for global static variables (e.g.BufferOrch::m_buffer_type_maps)
* in parallel to that, orchagent accesses the global static variables
Since quick_exit doesn't call atexit() flows, the LSAN check is called explicitly via __lsan_do_leak_check()
*/

#ifdef ASAN_ENABLED
__lsan_do_leak_check();
#endif

quick_exit(EXIT_FAILURE);
}