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

kraken: rbd: rbd_clone_copy_on_read ineffective with exclusive-lock #14543

Merged
merged 1 commit into from Jul 5, 2017
Merged

kraken: rbd: rbd_clone_copy_on_read ineffective with exclusive-lock #14543

merged 1 commit into from Jul 5, 2017

Conversation

smithfarm
Copy link
Contributor

@smithfarm smithfarm self-assigned this Apr 13, 2017
@smithfarm smithfarm added this to the kraken milestone Apr 13, 2017
@smithfarm
Copy link
Contributor Author 

/home/jenkins-build/build/workspace/ceph-pull-requests/src/librbd/image/RefreshRequest.cc: In instantiation of ‘void librbd::image::RefreshRequest<ImageCtxT>::apply() [with ImageCtxT = librbd::ImageCtx]’:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/librbd/image/RefreshRequest.cc:1080:31:   required from here
/home/jenkins-build/build/workspace/ceph-pull-requests/src/librbd/image/RefreshRequest.cc:1032:32: error: ‘class librbd::ImageCtx’ has no member named ‘io_work_queue’
       m_image_ctx.io_work_queue->clear_require_lock_on_read();
                                ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/librbd/image/RefreshRequest.cc:1053:36: error: ‘class librbd::ImageCtx’ has no member named ‘io_work_queue’
           m_image_ctx.io_work_queue->is_lock_required()) {
                                    ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/librbd/image/RefreshRequest.cc:1054:34: error: ‘class librbd::ImageCtx’ has no member named ‘io_work_queue’
         m_image_ctx.io_work_queue->set_require_lock_on_read();

@smithfarm smithfarm changed the title kraken: rbd: rbd_clone_copy_on_read ineffective with exclusive-lock [DNM] kraken: rbd: rbd_clone_copy_on_read ineffective with exclusive-lock Apr 15, 2017
@vshankar @smithfarm
librbd: acquire exclusive-lock during copy on read
c79d45f 
Fixes: http://tracker.ceph.com/issues/18888
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 7dba531)

Conflicts:
    src/librbd/AioImageRequestWQ.h:
      - in master this file has morphed into src/librbd/io/ImageRequestWQ.h
      - kraken has AioImageRequest<ImageCtx> instead of ImageRequest<ImageCtx>
    src/librbd/image/RefreshRequest.cc:
      - rename image context element to "aio_work_queue" (from "io_work_queue")
        because kraken doesn't have de95d86
    src/test/librbd/image/test_mock_RefreshRequest.cc:
      - rename image context element to "aio_work_queue" (from "io_work_queue")
        because kraken doesn't have de95d86
@smithfarm smithfarm changed the title [DNM] kraken: rbd: rbd_clone_copy_on_read ineffective with exclusive-lock kraken: rbd: rbd_clone_copy_on_read ineffective with exclusive-lock Jul 3, 2017
@smithfarm smithfarm requested a review from dillaman July 5, 2017 07:33
@smithfarm
Copy link
Contributor Author

@dillaman This PR passed an rbd run at http://tracker.ceph.com/issues/19009#note-56 (there were some failures that required a fix - applied via #16113). Please review/approve the PR if you agree it can be merged.

dillaman
dillaman approved these changes Jul 5, 2017
View reviewed changes
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.

👍

@smithfarm smithfarm merged commit 19deb31 into ceph:kraken Jul 5, 2017
@smithfarm smithfarm deleted the wip-19173-kraken branch July 5, 2017 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dillaman dillaman dillaman approved these changes

Assignees

@smithfarm smithfarm

Labels
bug-fix rbd
Projects
None yet
Milestone
kraken
3 participants
@smithfarm @dillaman @vshankar