From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 21 Jan 2015 22:23:00 +0000 (-0500)
Subject: librbd: schedule header refresh after watch error
X-Git-Tag: v0.93~198^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3456%2Fhead;p=ceph.git

librbd: schedule header refresh after watch error

If a librados watch error occurs, it is possible that one
or more events were missed.  Therefore, flag the header as
dirty so that it will be reloaded after the next operation.

Fixes: #4092
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/ImageWatcher.cc b/src/librbd/ImageWatcher.cc
index ede4c401c5904..6207d40d48a07 100644
--- a/src/librbd/ImageWatcher.cc
+++ b/src/librbd/ImageWatcher.cc
@@ -611,6 +611,7 @@ void ImageWatcher::reregister_watch() {
         return;
       }
     }
+    handle_header_update();
 
     if (lock_owner) {
       r = try_lock();