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

objecter: resend linger ops on split #5062

Merged
merged 2 commits into from Jul 21, 2015

Conversation

Projects
None yet
4 participants
@smithfarm
Contributor

smithfarm commented Jun 23, 2015

osd_types: factor out is_new_interval from check_new_interval
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 2ee3551)

@smithfarm smithfarm added this to the firefly milestone Jun 23, 2015

@smithfarm smithfarm self-assigned this Jun 23, 2015

Objecter: resend linger ops on any interval change
Watch/notify ops need to be resent after a pg split occurs, as well as
a few other circumstances that the existing objecter checks did not
catch.

Refactor the check the OSD uses for this to add a version taking the
more basic types instead of the whole OSD map, and stash the needed
info when an op is sent.

Fixes: #9806
Backport: giant, firefly, dumpling
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
(cherry picked from commit cb9262a)

Conflicts:
	src/osd/osd_types.cc
	src/osdc/Objecter.cc
            Minor differences.

@smithfarm smithfarm changed the title from Objecter: resend linger ops on split to [DNM] Objecter: resend linger ops on split Jun 24, 2015

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 24, 2015

ready for integration testing

@smithfarm smithfarm changed the title from [DNM] Objecter: resend linger ops on split to Objecter: resend linger ops on split Jun 24, 2015

@ghost ghost changed the title from Objecter: resend linger ops on split to objecter: resend linger ops on split Jul 21, 2015

@ghost

This comment has been minimized.

ghost commented Jul 21, 2015

Sam is the ultimate authority on splitting pg and he also authored the original patch.

@ghost

This comment has been minimized.

ghost commented Jul 21, 2015

@athanatos this backport passed a rados suite ( http://pulpito.ceph.com/loic-2015-07-09_21:09:04-rados-firefly-backports---basic-multi ), do you think it can be merged in firefly ?

@ghost ghost assigned athanatos and unassigned smithfarm Jul 21, 2015

jdurgin added a commit that referenced this pull request Jul 21, 2015

Merge pull request #5062 from SUSE/wip-11699-firefly
objecter: resend linger ops on split

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

@jdurgin jdurgin merged commit f7a085f into ceph:firefly Jul 21, 2015

@jdurgin

This comment has been minimized.

Member

jdurgin commented Jul 21, 2015

Looks like a good backport to me. I authored the original 2nd patch.

@smithfarm smithfarm deleted the SUSE:wip-11699-firefly branch Jul 22, 2015

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