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-31661 Add options to generate cpu resources as limits #18595

Merged
merged 1 commit into from
May 3, 2024
Merged

HPCC-31661 Add options to generate cpu resources as limits #18595

merged 1 commit into from
May 3, 2024

Conversation

ghalliday
Copy link
Member

@ghalliday ghalliday commented Apr 30, 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

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

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR

@ghalliday
Copy link
Member Author

From Copilot (experimental)

This pull request primarily focuses on the modification of the Helm charts in the hpcc package. The changes include the addition of new global parameters to manage resource limits and requests, and the refactoring of the resource allocation code across various templates. The new parameters, resourceCpusWithLimits and resourceWholeCpusWithLimits, provide more flexibility in setting CPU resource limits.

Key changes include:

Addition of new global parameters:

  • helm/hpcc/values.schema.json: Added new global parameters resourceCpusWithLimits and resourceWholeCpusWithLimits to manage CPU resource limits.

Refactoring of resource allocation code:

These changes are aimed at providing more flexibility in managing CPU resources in a Kubernetes environment, especially when the cpuManagerPolicy=static is used, which allows binding using affinities.

@ghalliday ghalliday requested a review from jakesmith April 30, 2024 16:16
jakesmith
jakesmith reviewed May 2, 2024
View reviewed changes
helm/hpcc/templates/_helpers.tpl Outdated
{{- $limits := omit $resources "cpu" }}
{{- $requests := pick $resources "cpu" }}
{{- $omitResources := hasKey .root.Values.global "omitResources" | ternary .root.Values.global.omitResources .root.Values.global.privileged }}
{{- $resourceCpusWithLimits := hasKey .root.Values.global "resourceCpusWithLimits" | ternary .root.Values.global.resourceCpusWithLimits false -}}
Copy link
Member

@jakesmith jakesmith May 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

trivial: double space before 'false'

jakesmith
jakesmith reviewed May 2, 2024
View reviewed changes
helm/hpcc/templates/_helpers.tpl Outdated
{{- $requests := pick $resources "cpu" }}
{{- $omitResources := hasKey .root.Values.global "omitResources" | ternary .root.Values.global.omitResources .root.Values.global.privileged }}
{{- $resourceCpusWithLimits := hasKey .root.Values.global "resourceCpusWithLimits" | ternary .root.Values.global.resourceCpusWithLimits false -}}
{{- $resourceWholeCpusWithLimits := hasKey .root.Values.global "resourceWholeCpusWithLimits" | ternary .root.Values.global.resourceWholeCpusWithLimits false -}}
Copy link
Member

Choose a reason for hiding this comment

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

trivial: double space before 'false'

jakesmith
jakesmith approved these changes May 2, 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.

@ghalliday - 2 trivial spacing issue. Looks good.

@ghalliday ghalliday force-pushed the issue31661 branch 2 times, most recently from 2a99612 to d79afc6 Compare May 3, 2024 14:01
@ghalliday ghalliday requested a review from jakesmith May 3, 2024 14:07
@ghalliday
Copy link
Member Author

@jakesmith please re-review for sanity. I have rebased onto latest to include your privileged change and the increase in stub resources. I have sanity checked all the parameters are correct, but looking for a second opinion to check we don't break something.

jakesmith
jakesmith reviewed May 3, 2024
View reviewed changes
helm/hpcc/values.schema.json Outdated
@@ -273,6 +273,14 @@
"description": "if set, no resource definitions are generated from the helm charts",
"type": "boolean"
},
"resourceCpusWithLimits": {
"description": "if set, cpu resources are provided as limits rather than requests. Not recommended because this can lead to painful throttling on roxie",
Copy link
Member

Choose a reason for hiding this comment

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

not just roxie - we saw on Thor originally I think

jakesmith
jakesmith approved these changes May 3, 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.

@ghalliday - looks good afaics. 1 trivial comment.

@ghalliday ghalliday merged commit 13987dc into hpcc-systems:candidate-9.4.x May 3, 2024
22 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.
2 participants
@ghalliday @jakesmith