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: fix map skipping #3952

Merged
2 commits merged into from Mar 20, 2015

Conversation

Projects
None yet
4 participants
@ghost

ghost commented Mar 11, 2015

Dingdh added some commits Oct 30, 2014

osdc/Objecter: e shouldn't be zero in Objecter::handle_osd_map
Signed-off-by: Ding Dinghua <dingdinghua85@gmail.com>
(cherry picked from commit 31c584c)

Conflicts:
	src/osdc/Objecter.cc
        the debug line that follows was re-indented
osdc/Objecter: Fix a bug of dead looping in Objecter::handle_osd_map
If current map epoch is less than oldest epoch, current map epoch
should step up to oldest epoch.

Fixes: #9986
Signed-off-by: Ding Dinghua <dingdinghua85@gmail.com>
(cherry picked from commit e0166a2)

Conflicts:
	src/osdc/Objecter.cc
        the debug line that follows was re-indented

@ghost ghost added bug fix core labels Mar 11, 2015

@ghost ghost self-assigned this Mar 11, 2015

@ghost ghost added this to the firefly milestone Mar 11, 2015

@loic-bot

This comment has been minimized.

loic-bot commented Mar 11, 2015

SUCCESS: the output of run-make-check.sh on centos-7 for 26ba343 is http://paste2.org/ZpjgxEd9

:octocat: Sent from GH.

@athanatos

This comment has been minimized.

Contributor

athanatos commented Mar 16, 2015

Might want to run this one by whomever reviewed it originally.

@ghost

This comment has been minimized.

ghost commented Mar 16, 2015

@liewegas added the commits to the pull request and you merged it @athanatos There is more context at #2851 and http://tracker.ceph.com/issues/9986 if that helps

@ghost ghost assigned liewegas and unassigned ghost Mar 16, 2015

@liewegas

This comment has been minimized.

Member

liewegas commented Mar 17, 2015

lgtm

@liewegas liewegas assigned ghost and unassigned liewegas Mar 20, 2015

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

Merge pull request #3952 from dachary/wip-9986-firefly
objecter: fix map skipping

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

@ghost ghost merged commit 2fbb9a6 into ceph:firefly Mar 20, 2015

This issue was closed.

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