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

[17.09] Serializing bitseq alloc #2018

Merged
merged 3 commits into from
Dec 13, 2017

Conversation

thaJeztah
Copy link
Member

Cherry-pick of #1788 for 17.09

git checkout -b 17.09-backport-ipam_alloc upstream/bump_17.09
git cherry-pick -s -S -x 5790b5c17ce7a6e2733ba0f4dfccced8144237e3
git cherry-pick -s -S -x 0184de8fc5074f94a74a0025ff60dab69cc442a9
git cherry-pick -s -S -x a2bcac00122a43d771af77ff060794dd02bb4a00

@thaJeztah
Copy link
Member Author

#1947 may be needed to address the lint-errors

Previously the bitseq alloc was allocating the first available bit from the
begining of the sequence. With this commit the bitseq alloc will proceed
from the current allocation. This change will affect the way ipam and vni
allocation is done currently. The ip allocation will be done sequentially
from the previous allocation as opposed to the first available IP.

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
(cherry picked from commit 5790b5c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Since bit allocation is no longer first available from
the start some verfications are removed/modified to
the change allocation model

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
(cherry picked from commit 0184de8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
(cherry picked from commit a2bcac0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@fcrisciani
Copy link

@abhi can you give the final blessing?

Copy link
Contributor

@abhi abhi left a comment

Choose a reason for hiding this comment

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

LGTM

@abhi
Copy link
Contributor

abhi commented Dec 1, 2017

corresponding swarmkit change will required as well

@fcrisciani fcrisciani merged commit 1224aa8 into moby:bump_17.09 Dec 13, 2017
@thaJeztah thaJeztah deleted the 17.09-backport-ipam_alloc branch December 13, 2017 05:47
@thaJeztah
Copy link
Member Author

/cc @andrewhsu in case we do a 17.09.2

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

3 participants