From: songweibin <song.weibin@zte.com.cn>
Date: Thu, 19 Mar 2020 12:51:59 +0000 (+0800)
Subject: librbd: don't set objectmap invalid when load objectmap timed out
X-Git-Tag: wip-pdonnell-testing-20200918.022351~600^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83d986988b03419a8035ae7fb86569b0e0cbeb8b;p=ceph-ci.git

librbd: don't set objectmap invalid when load objectmap timed out

Add a new configuration option of `rbd_invalidate_object_map_on_timeout`,
if disabled and timed out to open/update object map, donot invalidating
object map and return -ETIMEDOUT to APP.

Signed-off-by: songweibin <song.weibin@zte.com.cn>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 3ff9807aca2..de44c662918 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7364,6 +7364,10 @@ static std::vector<Option> get_rbd_options() {
     .set_default(true)
     .set_description("validate new image names for RBD compatibility"),
 
+    Option("rbd_invalidate_object_map_on_timeout", Option::TYPE_BOOL, Option::LEVEL_DEV)
+    .set_default(true)
+    .set_description("true if object map should be invalidated when load or update timeout"),
+
     Option("rbd_auto_exclusive_lock_until_manual_request", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(true)
     .set_description("automatically acquire/release exclusive lock until it is explicitly requested"),
diff --git a/src/librbd/object_map/RefreshRequest.cc b/src/librbd/object_map/RefreshRequest.cc
index d9febda66da..0f6b81923e0 100644
--- a/src/librbd/object_map/RefreshRequest.cc
+++ b/src/librbd/object_map/RefreshRequest.cc
@@ -133,6 +133,11 @@ Context *RefreshRequest<I>::handle_load(int *ret_val) {
     return nullptr;
   } else if (*ret_val < 0) {
     lderr(cct) << "failed to load object map: " << oid << dendl;
+    if (*ret_val == -ETIMEDOUT &&
+        !cct->_conf.get_val<bool>("rbd_invalidate_object_map_on_timeout")) {
+      return m_on_finish;
+    }
+
     send_invalidate();
     return nullptr;
   }
diff --git a/src/librbd/object_map/Request.cc b/src/librbd/object_map/Request.cc
index e323251878a..6677882eae5 100644
--- a/src/librbd/object_map/Request.cc
+++ b/src/librbd/object_map/Request.cc
@@ -22,7 +22,11 @@ bool Request::should_complete(int r) {
   switch (m_state)
   {
   case STATE_REQUEST:
-    if (r < 0) {
+    if (r == -ETIMEDOUT &&
+        !cct->_conf.get_val<bool>("rbd_invalidate_object_map_on_timeout")) {
+      m_state = STATE_TIMEOUT;
+      return true;
+    } else if (r < 0) {
       lderr(cct) << "failed to update object map: " << cpp_strerror(r)
 		 << dendl;
       return invalidate();
diff --git a/src/librbd/object_map/Request.h b/src/librbd/object_map/Request.h
index aef8800dd8a..7e9bfb88dfd 100644
--- a/src/librbd/object_map/Request.h
+++ b/src/librbd/object_map/Request.h
@@ -41,6 +41,9 @@ protected:
 
 private:
   /**
+   *              STATE_TIMEOUT --------\
+   *                   ^                |
+   *                   |                v
    * <start> ---> STATE_REQUEST ---> <finish>
    *                   |                ^
    *                   v                |
@@ -48,6 +51,7 @@ private:
    */
   enum State {
     STATE_REQUEST,
+    STATE_TIMEOUT,
     STATE_INVALIDATE
   };