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

nautilus: pybind/mgr/balancer/module.py: assign weight-sets to all buckets before balancing #40128

Merged
merged 1 commit into from Apr 5, 2021

Conversation

neha-ojha
Copy link
Member

backport tracker: https://tracker.ceph.com/issues/49759


backport of #40007
parent tracker: https://tracker.ceph.com/issues/49576

this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

…re balancing

Add an additional check to make sure that the choose_args section has the same
number of buckets as the crushmap. If not, ensure that
get_compat_weight_set_weights assigns weight-sets to all buckets.

Without this change, if we end up with an orig_ws, which has fewer buckets
than the crushmap, the mgr will crash due a KeyError in do_crush_compat().

Fixes: https://tracker.ceph.com/issues/49576
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 42c01f0)

 Conflicts:
	src/pybind/mgr/balancer/module.py - trivial resolution
@neha-ojha neha-ojha added this to the nautilus milestone Mar 15, 2021
@neha-ojha neha-ojha requested a review from dzafman March 15, 2021 21:10
@smithfarm smithfarm added nautilus-batch-1 nautilus point releases needs-qa labels Mar 22, 2021
@jdurgin jdurgin changed the base branch from nautilus to nautilus-saved March 31, 2021 00:14
@jdurgin jdurgin changed the base branch from nautilus-saved to nautilus March 31, 2021 00:14
Copy link
Member

@ideepika ideepika left a comment

Choose a reason for hiding this comment

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

@yuriw yuriw merged commit d8b8f37 into ceph:nautilus Apr 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants