Skip to content

[Syncd] make sure syncd can exit gracefully #321

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
yxieca merged 5 commits into from
May 24, 2018
Merged

[Syncd] make sure syncd can exit gracefully #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c0011ec
[syncd] stop notification thread before calling remove_switch()
yxieca May 23, 2018
7e3a18f
[notif] don't detach syncd notification thread
yxieca May 23, 2018
0a50c48
[flex counter] remove all flex counters before exiting syncd
yxieca May 24, 2018
420bc30
Remove the early quit
yxieca May 24, 2018
435c4e8
Add log enter to removeAllCounters()
yxieca May 24, 2018
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
7 changes: 5 additions & 2 deletions syncd/syncd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3449,6 +3449,11 @@ int syncd_main(int argc, char **argv)

#endif

FlexCounter::removeAllCounters();

// Stop notification thread before removing switch
stopNotificationsProcessingThread();

status = sai_switch_api->remove_switch(gSwitchId);
if (status != SAI_STATUS_SUCCESS)
{
Expand All @@ -3465,8 +3470,6 @@ int syncd_main(int argc, char **argv)
SWSS_LOG_ERROR("failed to uninitialize api: %s", sai_serialize_status(status).c_str());
}

stopNotificationsProcessingThread();

SWSS_LOG_NOTICE("uninitialize finished");

return EXIT_SUCCESS;
Expand Down
7 changes: 7 additions & 0 deletions syncd/syncd_flex_counter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,13 @@ void FlexCounter::removeCounterPlugin(
}
}

void FlexCounter::removeAllCounters()
{
SWSS_LOG_ENTER();

g_flex_counters_map.clear();
}


FlexCounter::~FlexCounter(void)
{
Expand Down
1 change: 1 addition & 0 deletions syncd/syncd_flex_counter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class FlexCounter
_In_ std::string instanceId);
static void removeCounterPlugin(
_In_ std::string instanceId);
static void removeAllCounters();

FlexCounter(
_In_ const FlexCounter&) = delete;
Expand Down
2 changes: 0 additions & 2 deletions syncd/syncd_notifications.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,8 +559,6 @@ void startNotificationsProcessingThread()
runThread = true;

ntf_process_thread = std::make_shared<std::thread>(ntf_process_function);

ntf_process_thread->detach();
Copy link
Collaborator

@kcudnik kcudnik May 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea this was causing issue

}

void stopNotificationsProcessingThread()
Expand Down