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 [gh-19729] Fix logic for updating terminal allocs on clients with max client disconnect into release/1.6.x #20249

Merged

Conversation

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

Backport

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

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@Juanadelacuesta
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/nomad/merges: 409 Merge conflict []

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


Allocations with enabled max_client_disconnect and on terminal states where being ignored and not updated, causing unexpected reconciliations.


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Mar 28, 2024

CLA assistant check
All committers have signed the CLA.

@Juanadelacuesta Juanadelacuesta force-pushed the backport/b-gh-19729/explicitly-aware-gull branch from 952053e to e8da6cb Compare March 28, 2024 18:36
… client disconnect (#20181)

Only ignore allocs on terminal states that are updated
---------

Co-authored-by: Tim Gross <tgross@hashicorp.com>
@Juanadelacuesta Juanadelacuesta merged commit 04f8b25 into release/1.6.x Apr 2, 2024
25 checks passed
@Juanadelacuesta Juanadelacuesta deleted the backport/b-gh-19729/explicitly-aware-gull branch April 2, 2024 09:48
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.

3 participants