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

Backport of Prevent kill_timeout greater than progress_deadline into release/1.4.x #17205

Merged
merged 2 commits into from
May 16, 2023

Conversation

hc-github-team-nomad-core
Copy link
Contributor

Backport

This PR is auto-generated from #16761 to be assessed for backporting due to the inclusion of the label backport/1.4.x.

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

The below text is copied from the body of the original PR.


This PR addresses the bug reported on #8487

If a kill_timeout is greater than the job's progress_deadline, allocations may keep running (after initial kill signal) for long enough that the deploy fails. However, the allocations that were scheduled by that job will still be pending after job failure, and will be placed and started once the previous allocations do exit. This PR adds a validation to avoid this situation.

@hc-github-team-nomad-core hc-github-team-nomad-core force-pushed the backport/b-gh-8487/frankly-hopeful-platypus branch 2 times, most recently from c119842 to 6ad39fe Compare May 16, 2023 14:44
@hashicorp-cla
Copy link

hashicorp-cla commented May 16, 2023

CLA assistant check
All committers have signed the CLA.

* func: add validation for kill timeout smaller than progress dealine

* style: add changelog

* style: typo in changelog

* style: remove refactored test

* Update .changelog/16761.txt

Co-authored-by: James Rasell <jrasell@users.noreply.github.com>

* Update nomad/structs/structs.go

Co-authored-by: James Rasell <jrasell@users.noreply.github.com>

---------

Co-authored-by: James Rasell <jrasell@users.noreply.github.com>
@lgfa29 lgfa29 force-pushed the backport/b-gh-8487/frankly-hopeful-platypus branch from f743507 to d199cf2 Compare May 16, 2023 14:50
@lgfa29 lgfa29 requested a review from jrasell May 16, 2023 14:50
@lgfa29
Copy link
Contributor

lgfa29 commented May 16, 2023

The PR originally failed to backport into release/1.4.x, so I'm doing it manually here.

Copy link
Member

@Juanadelacuesta Juanadelacuesta left a comment

Choose a reason for hiding this comment

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

LGTM

@lgfa29 lgfa29 merged commit c7ad698 into release/1.4.x May 16, 2023
@lgfa29 lgfa29 deleted the backport/b-gh-8487/frankly-hopeful-platypus branch May 16, 2023 15:15
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.

None yet

4 participants