-
Notifications
You must be signed in to change notification settings - Fork 304
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-31116 Fix 1 min delay introduced waiting for some CQ's #18776
HPCC-31116 Fix 1 min delay introduced waiting for some CQ's #18776
Conversation
Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-31116 Jirabot Action Result: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jakesmith one question about whether any of these changes will hit a race condition between aborting and starting a child query/graph?
thorlcr/graph/thgraph.cpp
Outdated
@@ -1812,7 +1812,7 @@ bool CGraphBase::wait(unsigned timeout) | |||
|
|||
void CGraphBase::abort(IException *e) | |||
{ | |||
if (aborted) | |||
if (aborted || !started) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there any potential problem with a child query that is just about to start?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you're right, if this is a container containing child graphs, then it should be allowed to recurse.
This change (and the similar on in CSlaveGraph::abort weres incidental to the actual fix (in CSlaveGraph::done), I'll remove these changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ghalliday - see 2nd commit
The changes introduced by HPCC-30288 also caused Thor to stall for 1 minute per CQ that had not been started. Signed-off-by: Jake Smith <[email protected]>
f24fafe
to
5a9d689
Compare
@ghalliday - squashed |
The changes introduced by HPCC-30288 also caused Thor to stall for 1 minute per CQ that had not been started.
Type of change:
Checklist:
Smoketest:
Testing: