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.

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

Jump to bottom

HPCC-32964 Add a Roxie Background priority queue #19290

Merged
merged 1 commit into from
Jan 9, 2025
Merged

HPCC-32964 Add a Roxie Background priority queue #19290

merged 1 commit into from
Jan 9, 2025
+67 −37

Conversation

mckellyln
Copy link
Contributor

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:

@github-actions GitHub Actions
Copy link

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

Jirabot Action Result:
Assigning user: [email protected]
Workflow Transition To: Merge Pending
Updated PR

@mckellyln mckellyln force-pushed the hpcc-32964 branch 2 times, most recently from 9680d8d to b0c6f2b Compare November 11, 2024 16:15
richardkchapman
richardkchapman reviewed Nov 13, 2024
View reviewed changes
Copy link
Member

@richardkchapman richardkchapman left a comment

Choose a reason for hiding this comment

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

I think this is ok, other than the comment re clarity. The -1 vs 3 translation is a bit clunky but I'm not sure what would be better.

This PR is not intended to include automatic routing to the BG queue ever, I assume?

roxie/ccd/ccdserver.cpp
if ((colocalArg == 0) && // not a child query activity??
(p->queryHeader().activityId & (ROXIE_SLA_PRIORITY | ROXIE_HIGH_PRIORITY)) &&
(pmask && (pmask != ROXIE_PRIORITY_MASK)) &&
Copy link
Member

Choose a reason for hiding this comment

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

You only want to request fastlane for SLA/HIGH. This code might do that, but it took me several reads of it to be sure. Can it be coded more clearly?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok.
pmask != 0 => its SLA, HIGH or BG
pmask != ROXIE_PRIORITY_MASK => its not BG

@mckellyln
Copy link
Contributor Author

I agree I think we can remove the explicit BG queue time limits because this BG queue will not be something one can publish a query to, but rather a queue for dynamically submitting to.

@mckellyln mckellyln force-pushed the hpcc-32964 branch 2 times, most recently from dc51187 to 6a17ea1 Compare November 23, 2024 01:27
ghalliday
ghalliday reviewed Nov 28, 2024
View reviewed changes
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.

@mckellyln looks good. Some very minor comments.

roxie/ccd/ccdqueue.cpp Outdated
@@ -162,6 +162,7 @@ StringBuffer &RoxiePacketHeader::toString(StringBuffer &ret) const
case ROXIE_SLA_PRIORITY: ret.append("SLA"); break;
case ROXIE_HIGH_PRIORITY: ret.append("HIGH"); break;
case ROXIE_LOW_PRIORITY: ret.append("LOW"); break;
case ROXIE_SLA_PRIORITY + ROXIE_HIGH_PRIORITY: ret.append("BG"); break;
Copy link
Member

Choose a reason for hiding this comment

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

trivial: Add an ROXIE_BG_PRIORITY constant.

roxie/ccd/ccdqueue.cpp Outdated
hiQueue.enqueue(packet, IBYTIdelay);
else
loQueue.enqueue(packet, IBYTIdelay);
switch(header.activityId & ROXIE_PRIORITY_MASK)
Copy link
Member

Choose a reason for hiding this comment

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

trivial: Normally have a space after a switch keyword (same below)

roxie/ccd/ccdserver.cpp
if ((colocalArg == 0) && // not a child query activity??
(p->queryHeader().activityId & (ROXIE_SLA_PRIORITY | ROXIE_HIGH_PRIORITY)) &&
(pmask && (pmask != (ROXIE_SLA_PRIORITY + ROXIE_HIGH_PRIORITY))) &&
Copy link
Member

Choose a reason for hiding this comment

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

minor: Compare explicitly against ROXIE_LOW_PRIORITY rather than implicitly, and use a new constant for background.

@mckellyln mckellyln requested a review from ghalliday January 2, 2025 14:30
@mckellyln
Copy link
Contributor Author

Updated for re-review.

ghalliday
ghalliday approved these changes Jan 2, 2025
View reviewed changes
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.

I think it looks good to me.

There would be scope for refactoring to use some arrays/avoid some of the switch statements, but unlikely to be worth the upheaval.

@mckellyln
Copy link
Contributor Author

Squashed.

@mckellyln mckellyln mentioned this pull request Jan 6, 2025
Open
39 tasks
richardkchapman
richardkchapman approved these changes Jan 8, 2025
View reviewed changes
Copy link
Member

@richardkchapman richardkchapman left a comment

Choose a reason for hiding this comment

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

Looks good

@ghalliday ghalliday merged commit 7aabf01 into hpcc-systems:candidate-9.8.x Jan 9, 2025
48 checks passed
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 9, 2025

Jirabot Action Result:
Added fix version: 9.8.48
Workflow Transition: 'Resolve issue'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ghalliday ghalliday ghalliday approved these changes

@richardkchapman richardkchapman richardkchapman approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mckellyln @richardkchapman @ghalliday