]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rbd-mirror: rename asok hook to match image name when not replaying 21726/head
authorJason Dillaman <dillaman@redhat.com>
Thu, 26 Apr 2018 16:24:27 +0000 (12:24 -0400)
committerNathan Cutler <ncutler@suse.com>
Sun, 29 Apr 2018 10:03:29 +0000 (12:03 +0200)
commit281b9fd75eac08422d614069559b78dab6101ace
tree916334376f8c518c3eb772d06d0ad55eaa7530d6
parentc2b01766288ba1f22d910a25f532a13a89df91be
rbd-mirror: rename asok hook to match image name when not replaying

Fixes: http://tracker.ceph.com/issues/23888
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3ec26ff84d3b622a95142587a29b511e48c4bc85)

Conflicts: (trivial resolution)
src/test/rbd_mirror/test_mock_ImageReplayer.cc
src/tools/rbd_mirror/ImageReplayer.cc
src/test/rbd_mirror/image_replayer/test_mock_PrepareLocalImageRequest.cc
src/test/rbd_mirror/test_mock_ImageReplayer.cc
src/tools/rbd_mirror/ImageReplayer.cc
src/tools/rbd_mirror/ImageReplayer.h
src/tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.cc
src/tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.h