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

osd: is_new_interval() fixes #5691

Merged
merged 2 commits into from Aug 28, 2015
Merged

osd: is_new_interval() fixes #5691

merged 2 commits into from Aug 28, 2015

Conversation

jdurgin
Copy link
Member

@jdurgin jdurgin commented Aug 27, 2015

athanatos and others added 2 commits August 27, 2015 15:25
Fixes: 11771
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit ff79959)
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: ceph#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
@jdurgin jdurgin added this to the hammer milestone Aug 27, 2015
@jdurgin jdurgin changed the title wip-10399-hammer is_new_interval() fixes Aug 27, 2015
@ghost ghost self-assigned this Aug 28, 2015
@athanatos
Copy link
Contributor

lgtm

jdurgin added a commit that referenced this pull request Aug 28, 2015
is_new_interval() fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
@jdurgin jdurgin merged commit ed162d4 into ceph:hammer Aug 28, 2015
@jdurgin jdurgin deleted the wip-10399-hammer branch August 28, 2015 18:43
@ghost ghost changed the title is_new_interval() fixes osd: is_new_interval() fixes Sep 13, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants