Skip to content

service: Use initNextID in acquireLocalID()#13576

Merged
tklauser merged 1 commit intocilium:masterfrom
hzhou8:fix-initNextID
Oct 15, 2020
Merged

service: Use initNextID in acquireLocalID()#13576
tklauser merged 1 commit intocilium:masterfrom
hzhou8:fix-initNextID

Conversation

@hzhou8
Copy link
Copy Markdown
Contributor

@hzhou8 hzhou8 commented Oct 15, 2020

When rolling over, it should use initNextID instead of FirstFreeServiceID,
which doesn't belong to the IDAllocator. This would create problems if
FirstFreeServiceID and FirstFreeBackendID have different values although now
they happen to be the same.

Fixes: ab9cf4b ("service: Make local ID allocator more service agnostic")
Signed-off-by: Han Zhou hzhou8@ebay.com

When rolling over, it should use initNextID instead of FirstFreeServiceID,
which doesn't belong to the IDAllocator. This would create problems if
FirstFreeServiceID and FirstFreeBackendID have different values although now
they happen to be the same.

Fixes: ab9cf4b ("service: Make local ID allocator more service agnostic")
Signed-off-by: Han Zhou <hzhou8@ebay.com>
@hzhou8 hzhou8 requested a review from a team October 15, 2020 06:25
@maintainer-s-little-helper maintainer-s-little-helper Bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Oct 15, 2020
Copy link
Copy Markdown
Member

@brb brb left a comment

Choose a reason for hiding this comment

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

Thanks!

@brb brb added needs-backport/1.7 release-note/bug This PR fixes an issue in a previous release of Cilium. labels Oct 15, 2020
@maintainer-s-little-helper maintainer-s-little-helper Bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Oct 15, 2020
@brb
Copy link
Copy Markdown
Member

brb commented Oct 15, 2020

retest-net-next

@tklauser tklauser merged commit b34e5d8 into cilium:master Oct 15, 2020
@tklauser
Copy link
Copy Markdown
Member

As discussed out-of-band with @brb it's enough to run the net-next tests to verify this. Thus merged, thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release-note/bug This PR fixes an issue in a previous release of Cilium.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants