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-31569 Thor CostExecute calc will be incorrect if workersPerPod > 1 #18497

Merged
merged 1 commit into from
Apr 10, 2024
Merged

HPCC-31569 Thor CostExecute calc will be incorrect if workersPerPod > 1 #18497

merged 1 commit into from
Apr 10, 2024

Conversation

shamser
Copy link
Contributor

@shamser shamser commented Apr 5, 2024 •
edited
Loading

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

github-actions bot commented Apr 5, 2024

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

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR

@shamser shamser marked this pull request as ready for review April 5, 2024 13:53
@shamser shamser requested a review from jakesmith April 5, 2024 13:53
jakesmith
jakesmith reviewed Apr 5, 2024
View reviewed changes
Copy link
Member

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

I think the change is correct, but it does beg the question, why was it changed in https://hpccsystems.atlassian.net/browse/HPCC-28296 ?
Unfortunately, that JIRA doesn't describe the problem sufficiently to tell what the motivation was.

common/workunit/workunit.cpp
@@ -13937,13 +13937,16 @@ extern WORKUNIT_API double getThorManagerRate()

extern WORKUNIT_API double getThorWorkerRate()
{
// Note: (bare-metal) the use of getAffinityCpus to get the number of CPUs used by workers
// doesn't really make sense since the caller is likely to be running on thor manager (so it will
// return cpu affinity for the manager, rather than for the worker). This needs rethinking.
Copy link
Member

Choose a reason for hiding this comment

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

agreed. Is there a JIRA to track this? (can you link it to HPCC-31569)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done. I've created https://hpccsystems.atlassian.net/browse/HPCC-31572 and linked to this issue.

@jakesmith
Copy link
Member

@shamser - look correct to me, but could do with a fuller description of the problem in title+description + a associating a JIRA for the bare-metal issue.

@shamser shamser changed the title HPCC-31569 Thor CostExecute calc may be incorrect under some circumstances HPCC-31569 Thor CostExecute calc will be incorrect if workersPerPod > 1 Apr 5, 2024
@shamser shamser requested a review from jakesmith April 5, 2024 15:38
jakesmith
jakesmith approved these changes Apr 5, 2024
View reviewed changes
Copy link
Member

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

@shamser - looks correct.

@ghalliday ghalliday merged commit ec0bf91 into hpcc-systems:candidate-9.0.x Apr 10, 2024
51 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakesmith jakesmith jakesmith 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
@shamser @jakesmith @ghalliday