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-32781 RoxieSocketQueueManager::run may be blocked by actCrit #19171

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

richardkchapman
Copy link
Member

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
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.

@richardkchapman two minor comments.

I was debating which version to target, I think 9.10 is probably correct. The only item that might be moving to 9.6.x would be changes removing the release of packet outside of the critical block.

}

void abortChannel(unsigned channel)
inline void setPacket(IRoxieQueryPacket *p)
{
CriticalBlock b(actCrit);
Copy link
Member

Choose a reason for hiding this comment

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

This should probably use the same pattern as set Activity to avoid releasing in the crit sec:

  Owned<X> temp(p);
  {
     CriticalSection x;
     packet.swap(temp);

and also worth searching the entire source code for similar examples.

@@ -1316,6 +1317,7 @@ class RoxieQueue : public CInterface, implements IThreadFactory
void wait()
{
idle++;
CLeavableCriticalBlock b(availCrit, limitWaitingWorkers);
Copy link
Member

Choose a reason for hiding this comment

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

trivial: The (atomic) decrement of idle could be outside the critical block

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.

Please associated the PR with a jira, update the commit messages and change to non-draft

@richardkchapman richardkchapman changed the title HPCC-XXXXX RoxieSocketQueueManager::run may be blocked by actCrit HPCC-32781 RoxieSocketQueueManager::run may be blocked by actCrit Oct 9, 2024
@richardkchapman richardkchapman marked this pull request as ready for review October 9, 2024 10:36
Avoid need to obtain critsec just to check if a worker thread's packet matches

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
This was not used (I hope!) and was desiged to solve an issue that was better
managed by the IBYTI delay logic.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
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