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.

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

HPCC-29923 Avoid CRowServer cancel if not running #17573

Merged
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
5 changes: 3 additions & 2 deletions thorlcr/thorutil/thormisc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1364,8 +1364,9 @@ class CRowServer : public CSimpleInterface, implements IThreaded, implements IRo
#ifdef TRACE_GLOBAL_GROUP
ActPrintLog(activity, "%s", __func__);
#endif
running = false;
comm.cancel(RANK_ALL, mpTag);
bool wanted = true;
if (running.compare_exchange_strong(wanted, false))
comm.cancel(RANK_ALL, mpTag);
}
};

Expand Down