From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 2 May 2016 14:33:50 +0000 (-0400)
Subject: librbd: disable automatic refresh of image upon lock message
X-Git-Tag: v11.0.0~765^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8877%2Fhead;p=ceph.git

librbd: disable automatic refresh of image upon lock message

There is no need to refresh the image upon request/release/acquire
of the exclusive lock.  The next IO or maintenance op will kick off
the refresh.  This is interfering with the refresh state machine
unit test case (since two concurrent refreshes shouldn't be possible).

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

diff --git a/src/librbd/WatchNotifyTypes.h b/src/librbd/WatchNotifyTypes.h
index 813ff5fd49c6..f5ec6210e222 100644
--- a/src/librbd/WatchNotifyTypes.h
+++ b/src/librbd/WatchNotifyTypes.h
@@ -92,7 +92,7 @@ enum NotifyOp {
 
 struct AcquiredLockPayload {
   static const NotifyOp NOTIFY_OP = NOTIFY_OP_ACQUIRED_LOCK;
-  static const bool CHECK_FOR_REFRESH = true;
+  static const bool CHECK_FOR_REFRESH = false;
 
   ClientId client_id;
 
@@ -106,7 +106,7 @@ struct AcquiredLockPayload {
 
 struct ReleasedLockPayload {
   static const NotifyOp NOTIFY_OP = NOTIFY_OP_RELEASED_LOCK;
-  static const bool CHECK_FOR_REFRESH = true;
+  static const bool CHECK_FOR_REFRESH = false;
 
   ClientId client_id;
 
@@ -120,7 +120,7 @@ struct ReleasedLockPayload {
 
 struct RequestLockPayload {
   static const NotifyOp NOTIFY_OP = NOTIFY_OP_REQUEST_LOCK;
-  static const bool CHECK_FOR_REFRESH = true;
+  static const bool CHECK_FOR_REFRESH = false;
 
   ClientId client_id;
   bool force = false;