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

luminous: messages/MOSDMap: do compat reencode of crush map, too #18456

Merged
merged 6 commits into from Oct 25, 2017

Conversation

Projects
None yet
3 participants
@liewegas
Member

liewegas commented Oct 21, 2017

Plus we update the jewel-x upgrade suite so that some jewel clients try to operate against
the cluster. (This doesn't actually test the patch unfortunately since it is an incremental
map update that was missed, but it's still progress.)

messages/MOSDMap: do compat reencode of crush map, too
If we are reencoding an incremental, and it embeds a crush map, we need
to reencode that in a compatible way too.  This is especially true now
because we have the compat crush weight-sets.  Otherwise, a client may
learn the crush map through an incremental but not understand choose_args,
and not see/understand the alternate weight set.  It will send requests
to the wrong OSDs where they will just get dropped.

Fixes: http://tracker.ceph.com/issues/21882
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9eaafc6)

@liewegas liewegas added this to the luminous milestone Oct 21, 2017

@liewegas liewegas changed the title from luminous: messages/MOSDMap: do compat reencode of crush map, too to DNM luminous: messages/MOSDMap: do compat reencode of crush map, too Oct 23, 2017

liewegas added some commits Oct 21, 2017

qa/suites/upgrade/jewel-x/: set up compat weight-set after cluster up…
…grade

...but before we run some client workloads.  This will hopefully ensure
that older clients will behave.

Signed-off-by: Sage Weil <sage@redhat.com>
qa/suites/upgrade/jewel-x/parallel: run some jewel after completed up…
…grade

Signed-off-by: Sage Weil <sage@redhat.com>
crush/CrushWrapper: add bucket_set_alg()
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit edc411e)
mon/OSDMonitor: add 'osd crush set-all-straw-buckets-to-straw2'
This is a common and recommended step that users should take once they
have clients that support straw2 (hammer!).  Let's make it easy.

This may result in a small amount of data movement, but usually it is
very little.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9287705)

@liewegas liewegas changed the title from DNM luminous: messages/MOSDMap: do compat reencode of crush map, too to luminous: messages/MOSDMap: do compat reencode of crush map, too Oct 23, 2017

qa/suites/upgrade/jewel-x: make sure min compat client is hammer for …
…straw2

Signed-off-by: Sage Weil <sage@redhat.com>

@jdurgin jdurgin merged commit 9a28a5c into ceph:luminous Oct 25, 2017

4 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment