]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
librbd: attempt to recover lost image watcher upon all failures
authorJason Dillaman <dillaman@redhat.com>
Thu, 30 Aug 2018 20:51:10 +0000 (16:51 -0400)
committerJason Dillaman <dillaman@redhat.com>
Wed, 3 Oct 2018 15:08:20 +0000 (11:08 -0400)
commit7cdf14a3e41483c5b1813bda6fcbe85398bfb0a7
tree9554f5177c137d809105027d6e085d3ad023b778
parent95d3c5437f88ff9a15e7adcba43db920d5588406
librbd: attempt to recover lost image watcher upon all failures

For example, if an image is blacklisted and the blacklist eventually
expires, the image should recover its watch.

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

Conflicts:
src/librbd/watcher/RewatchRequest.cc: trivial resolution
src/test/librbd/CMakeLists.txt: trivial resolution
src/test/librbd/test_mock_Watcher.cc: trivial resolution
src/librbd/Watcher.cc
src/librbd/watcher/RewatchRequest.cc
src/test/librbd/CMakeLists.txt
src/test/librbd/test_mock_ObjectWatcher.cc [deleted file]
src/test/librbd/test_mock_Watcher.cc [new file with mode: 0644]
src/test/librbd/watcher/test_mock_RewatchRequest.cc