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

luminous: librbd: object map batch update might cause OSD suicide timeout #18416

Merged
merged 7 commits into from Oct 27, 2017
Merged

luminous: librbd: object map batch update might cause OSD suicide timeout #18416

merged 7 commits into from Oct 27, 2017

Conversation

ghost
Copy link

@ghost ghost commented Oct 20, 2017

Jason Dillaman added 7 commits October 19, 2017 18:50
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f35947e)
…erlist

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit daa29f7)
…ations

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit fc99603)
The PRE/POST states were previously divided into two halves for handling
the copy-up batch and the direct removal batch. This can be simplified by
just using a single PRE/POST for the entire deletion region.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 72ce457)

Conflicts:
	src/librbd/operation/TrimRequest.h
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3220480)
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4674b57)
Fixes: http://tracker.ceph.com/issues/21797
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 04c5d12)
@ghost ghost added this to the luminous milestone Oct 20, 2017
@ghost ghost requested a review from dillaman October 20, 2017 01:57
@dillaman
Copy link

@kmroz What was the cherry-pick conflict in ce62832?

Copy link

@dillaman dillaman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@dillaman
Copy link

... never mind, I see that it was just about the coverity member variable defaults added to the master branch.

@theanalyst
Copy link
Member

Passed a teuthology run at http://tracker.ceph.com/issues/21830#note-7 and will be merged when approved

Copy link

@dillaman dillaman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@theanalyst theanalyst merged commit 8742c61 into ceph:luminous Oct 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants