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

mon: scrub error (osdmap encoding mismatch?) upgrading from 0.80 to ~0.80.2 #5200

Merged
merged 4 commits into from Sep 10, 2015

Conversation

Projects
None yet
7 participants
osd/osd_types: be pedantic about encoding last_force_op_resend withou…
…t feature bit

The addition of the value is completely backward compatible, but if the
mon feature bits don't match it can cause monitor scrub noice (due to the
parallel OSDMap encoding).  Avoid that by only adding the new field if the
feature (which was added 2 patches after the encoding, see
3152faf and
45e79a1.

Fixes: #8815
Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c93da05)

Conflicts:
    src/osd/osd_types.cc
        drop encode_compat variable which is otherwise unused in this context

@smithfarm smithfarm self-assigned this Jul 10, 2015

wonzhq and others added some commits Jul 31, 2014

ceph_test_rados_api_tier: test promote-on-second-read behavior
http://tracker.ceph.com/issues/8674 References: #8674

Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1417ede)
osd: promotion on 2nd read for cache tiering
http://tracker.ceph.com/issues/8674 Fixes: #8674

Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
(cherry picked from commit 0ed3adc)
ReplicatedPG::maybe_handle_cache: do not skip promote for write_ordered
We cannot redirect a RW ordered read.

Fixes: #9064
Introduced: 0ed3adc
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 24aeca9)

@jecluis jecluis added this to the firefly milestone Jul 13, 2015

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Sep 4, 2015

@gregsfortytwo This has passed a rados suite (see http://tracker.ceph.com/issues/11644#rados for details). OK to merge, do you think? I'm asking you because you appear to have merged c93da05 .

@gregsfortytwo

This comment has been minimized.

Member

gregsfortytwo commented Sep 9, 2015

@smithfarm, if this was a clean cherry-pick it's probably good, but you'll have to get somebody off the RADOS team to check it. Sorry. I bet @tchaikov is willing and it might be interesting for him. :)

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Sep 9, 2015

@tchaikov: Thanks in advance!

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Sep 10, 2015

lgtm. dazzled by the involved commits. some of them dates back to 1 year ago!

@tchaikov tchaikov assigned smithfarm and unassigned tchaikov Sep 10, 2015

smithfarm added a commit that referenced this pull request Sep 10, 2015

Merge pull request #5200 from SUSE/wip-12289-firefly
mon: scrub error (osdmap encoding mismatch?) upgrading from 0.80 to ~0.80.2

Reviewed-by: Kefu Chai <kchai@redhat.com>

@smithfarm smithfarm merged commit 4b08895 into ceph:firefly Sep 10, 2015

@smithfarm smithfarm deleted the SUSE:wip-12289-firefly branch Sep 10, 2015

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Sep 10, 2015

@tchaikov Yes, some of these fixes should have been backported earlier :-/

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