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-31116 Fix 1 min delay introduced waiting for some CQ's #18776

Merged

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Jun 18, 2024

The changes introduced by HPCC-30288 also caused Thor to stall for 1 minute per CQ that had not been started.

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-31116

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR

@jakesmith jakesmith requested a review from ghalliday June 18, 2024 17:40
Copy link
Member

@ghalliday ghalliday left a 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?

@@ -1812,7 +1812,7 @@ bool CGraphBase::wait(unsigned timeout)

void CGraphBase::abort(IException *e)
{
if (aborted)
if (aborted || !started)
Copy link
Member

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?

Copy link
Member Author

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.

Copy link
Member Author

@jakesmith jakesmith left a 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

@jakesmith jakesmith requested a review from ghalliday June 20, 2024 15:38
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]>
@jakesmith jakesmith force-pushed the HPCC-31116-cq-1minstall branch from f24fafe to 5a9d689 Compare June 20, 2024 15:44
@jakesmith
Copy link
Member Author

@ghalliday - squashed

@ghalliday ghalliday merged commit b2592ee into hpcc-systems:candidate-9.4.x Jun 20, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants