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.

Sign up for GitHub

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

Jump to bottom

DNM: jewel: FAILED assert(m_image_ctx.journal == nullptr) #10869

Closed
wants to merge 10 commits into from
Closed

DNM: jewel: FAILED assert(m_image_ctx.journal == nullptr) #10869

wants to merge 10 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Aug 25, 2016 •
edited by ghost

@ghost ghost self-assigned this Aug 25, 2016
@ghost ghost added this to the jewel milestone Aug 25, 2016
@ghost ghost added bug-fix rbd labels Aug 25, 2016
@ghost
Copy link
Author

ghost commented Aug 25, 2016

@dillaman I would very much appreciate your review on the two conflicts resolutions 312d217 and 88922c1

@dillaman
Copy link

@dachary lgtm -- not sure if you were planning to get this in for 10.2.3, but I'd like to hold for 10.2.4 if possible to give more runtime on the master branch.

@ghost
Copy link
Author

ghost commented Aug 25, 2016

Jenkins test this please (bluefs crash)

@ghost ghost mentioned this pull request Aug 25, 2016
Merged
ghost pushed a commit that referenced this pull request Aug 25, 2016
Merge pull request #10869: jewel: FAILED assert(m_image_ctx.journal =…
88a7801 
…= nullptr)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
@ghost ghost changed the title jewel: FAILED assert(m_image_ctx.journal == nullptr) DNM: jewel: FAILED assert(m_image_ctx.journal == nullptr) Oct 10, 2016
@ghost
Copy link
Author

ghost commented Oct 10, 2016

Set DNM because it conflicts with other pull requests targetting jewel.

@ghost
Copy link
Author

ghost commented Oct 13, 2016

Must cherry-pick https://github.com/ceph/ceph/pull/11034/commits which is the commit for http://tracker.ceph.com/issues/17261

@ghost
Copy link
Author

ghost commented Oct 13, 2016

Cherry-pick commits from http://tracker.ceph.com/issues/17243 as found at #10945 on top of these

git log --no-merges --oneline --cherry-mark --left-right ceph/jewel...ceph/master -- src/librbd/ExclusiveLock.cc

f99dbbd librbd: potential null pointer dereference when requesting exclusive lock
5a68e33 librbd: use counter to track exclusive lock block/unblock requests
3dc1306 librbd: deadlock when replaying journal during image open
583ac91 librbd: interlock image refresh and lock operations
d0d97fc librbd: integrate asynchronous image rewatch state machine
66c6055 librbd: exclusive lock now supports reacquiring a lost lock
aa53f74 librbd: store exclusive lock cookie instead of recalculating
= ecea6dc librbd: delay acquiring exclusive lock if watch has failed
d8e7946 librbd: always respond to "release lock" request if lock owner
= dfe9f3e librbd: delay acquiring exclusive lock if watch has failed
= ebce8ce librbd: optionally block proxied requests with an error code
= 93e2faf librbd: optionally block proxied requests with an error code
= 895c975 librbd: block RPC requests while updating features
= db7aaff librbd: block RPC requests while updating features

@ghost
Copy link
Author

ghost commented Oct 13, 2016

Cherry-pick commits from http://tracker.ceph.com/issues/17242 as found at https://github.com/ceph/ceph/pull/10974/commits on top of these

@ghost
Copy link
Author

ghost commented Oct 13, 2016

@dillaman I think these four backports should be done together

http://tracker.ceph.com/issues/17134
http://tracker.ceph.com/issues/17261
http://tracker.ceph.com/issues/17243
http://tracker.ceph.com/issues/17242

if that looks right to you I'll keep going. If it feels wrong, just let me know and I'll figure it out ;-)

@dillaman
Copy link

@dachary lgtm

@dillaman
Copy link

BTW -- I'll perform a sanity check of commits between jewel and master once the majority of open rbd jewel PRs have been merged just to ensure we haven't missed anything important.

@ghost
Copy link
Author

ghost commented Oct 13, 2016

@dillaman ack

@dillaman
Copy link

Requires PR #11465 when merged

@dillaman dillaman mentioned this pull request Oct 24, 2016
Merged
@ghost ghost changed the base branch from jewel to jewel-next November 9, 2016 09:59
Jason Dillaman added 9 commits November 9, 2016 12:03
@ldachary
librbd: helper state machine for asynchronous watch recovery
fe819f3 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 32180aa)

Conflicts:
	src/librbd/CMakeLists.txt trivial context change
	src/librbd/Makefile.am trivial context change
@ldachary
cls_lock: support updating the lock cookie without releasing the lock
17ffcb5 
Fixes: http://tracker.ceph.com/issues/17015
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 377f576)
@ldachary
librbd: helper state machine to update lock cookie
6d8b4ae 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit d523df8)
@ldachary
librbd: store exclusive lock cookie instead of recalculating
d88bdc1 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit aa53f74)
@ldachary
librbd: exclusive lock now supports reacquiring a lost lock
1aae693 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 66c6055)
@ldachary
librbd: always respond to "release lock" request if lock owner
edfe860 
Fixes: http://tracker.ceph.com/issues/17030
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit d8e7946)
@ldachary
librbd: integrate asynchronous image rewatch state machine
c0a5836 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit d0d97fc)
@ldachary
librbd: image state machine now has hooks for lock requests
908c7e7 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit a5b8c9c)
@ldachary
librbd: interlock image refresh and lock operations
45eb8f3 
Fixes: http://tracker.ceph.com/issues/16773
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 583ac91)

Conflicts:
	src/test/librbd/exclusive_lock/test_mock_AcquireRequest.cc
        context conflict because of tests introduced by
        73e4c65 which has not
        yet been backported (but will eventually)
@ldachary
librbd: remove unused refresh request logic
337d048 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 5156b43)
@ghost
Copy link
Author

ghost commented Nov 9, 2016

rebased and the conflicts are still relevant as well as how they were resolved

@ghost
Copy link
Author

ghost commented Nov 9, 2016 •
edited by ghost

"librbd: integrate asynchronous image rewatch state machine" looks like it is meaningfull only if 65d44d5 librbd: asynchronous image creation state machine is backported. Meaning http://tracker.ceph.com/issues/17008 needs to be backported before this.

Update: Jason says there is no relationship, ignore.

@ghost
Copy link
Author

ghost commented Nov 9, 2016

jason already has a backport for this one

@ghost ghost closed this Nov 9, 2016
liewegas pushed a commit to liewegas/ceph that referenced this pull request Nov 18, 2016
@zmc
Fixes ceph#10869, added {role} to the dir name.
4ebfc70 
Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>

Fixed typo

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
(cherry picked from commit 9942440ddf9f6847e76de3b49f1ad0d98c62a3d0)
(cherry picked from commit fea2e22)
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bug-fix rbd
Projects
None yet
Milestone
jewel
1 participant
@dillaman