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

Revert #2744 to prevent livelock when attempting to increase datastore pool #2810

Merged
merged 1 commit into from Feb 28, 2024

Conversation

jdn5126
Copy link
Contributor

@jdn5126 jdn5126 commented Feb 23, 2024

What type of PR is this?
bug

Which issue does this PR fix:
#2807

What does this PR do / Why do we need it:
This PR fixes a livelock condition that was reported in #2807. When the datastore pool is too low, we try to aggressively scale up to the desired state, hence the for loop. Under certain conditions, the datastore pool could return "too low" for a prolonged period of time (or indefinitely).

The change here is to revert #2744 so that only one scale up attempt happens during each iteration of the activity loop.

If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
N/A

Testing done on this change:
Ran all integration tests to ensure that they passed.

Will this PR introduce any new dependencies?:
No

Will this break upgrades or downgrades? Has updating a running cluster been tested?:
No, Yes

Does this change require updates to the CNI daemonset config files to work?:
No

Does this PR introduce any user-facing change?:
Yes

Fix potential livelock while trying to increase the size of the datastore pool

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@jdn5126 jdn5126 requested a review from a team as a code owner February 23, 2024 19:22
pkg/ipamd/ipamd.go Outdated Show resolved Hide resolved
pkg/ipamd/ipamd.go Outdated Show resolved Hide resolved
@jdn5126 jdn5126 changed the title Prevent livelock when attempting to increase datastore pool Revert #2744 to prevent livelock when attempting to increase datastore pool Feb 28, 2024
Copy link
Contributor

@jayanthvn jayanthvn left a comment

Choose a reason for hiding this comment

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

lgtm..

@jdn5126 jdn5126 merged commit dba87e6 into aws:master Feb 28, 2024
6 checks passed
@jdn5126 jdn5126 deleted the high_cpu branch February 28, 2024 19:25
@orsenthil
Copy link
Contributor

LGTM too.

@orsenthil orsenthil mentioned this pull request Mar 1, 2024
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