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

osd: is_new_interval() fixes #5726

Merged
2 commits merged into from Oct 20, 2015

Conversation

Projects
None yet
6 participants
@jdurgin
Member

jdurgin commented Aug 31, 2015

http://tracker.ceph.com/issues/12842 and http://tracker.ceph.com/issues/12752

The first commit preserves watches if the replication factor of pool is changed,
so rbd snapshots continue working in this case.

The 2nd one fixes an error in split handling that can cause a client
to crash while pg_num is increased for a pool.

@liewegas

This comment has been minimized.

Member

liewegas commented Aug 31, 2015

👍

@smithfarm smithfarm added this to the firefly milestone Aug 31, 2015

@ghost

This comment has been minimized.

ghost commented Aug 31, 2015

@jdurgin is the double "cherry pick from" on 736d9c4 intended ?

@jdurgin

This comment has been minimized.

Member

jdurgin commented Aug 31, 2015

@dachary yeah, I cherry-picked the ones from hammer to avoid resolving the same conflicts twice

@ghost

This comment has been minimized.

ghost commented Aug 31, 2015

In that case maybe cherry-pick instead of cherry-pick -x would have been enough ?

@jdurgin

This comment has been minimized.

Member

jdurgin commented Aug 31, 2015

yes, no reason to keep in really. just in the habit of doing -x. I'll remove the extra 'cherry pick from'

athanatos and others added some commits May 26, 2015

osd_types::is_new_interval: size change triggers new interval
Fixes: 11771
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit ff79959)
Objecter: pg_interval_t::is_new_interval needs pgid from previous pool
When increasing the pg_num of a pool, an assert would fail since the
calculated pgid seed would be for the pool's new pg_num value instead
of the previous pg_num value.

Fixes: #10399
Backport: infernalis, hammer, firefly
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f20f7a2)

Conflicts: (hobject_t sort order not backported, trivial resolution)
	src/osdc/Objecter.cc
	src/osdc/Objecter.h

ghost pushed a commit that referenced this pull request Oct 20, 2015

Merge pull request #5726: is_new_interval() fixes
Reviewed-by: Loic Dachary <ldachary@redhat.com>

ghost pushed a commit that referenced this pull request Oct 20, 2015

Loic Dachary
Merge pull request #5726 from ceph/wip-12752
is_new_interval() fixes

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

@ghost ghost merged commit aead425 into firefly Oct 20, 2015

@ghost ghost changed the title from is_new_interval() fixes to osd: is_new_interval() fixes Oct 24, 2015

@liewegas liewegas deleted the wip-12752 branch Nov 23, 2016

This issue was closed.

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