rgw: break out of inifinite ECANCELED state

Don't wait forever, we might be in this state due to a bug, so it's
better to abort with EIO at this point.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 2e904d3c830301219025502b38f66d1191dbdb54..170f71414459b906db7ff38c91cf555c5593a49b 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -5941,8 +5941,10 @@ int RGWRados::set_olh(RGWObjectCtx& obj_ctx, RGWBucketInfo& bucket_info, rgw_obj
   RGWObjState *state = NULL;
 
   int ret = 0;
+  int i;
 
-  do {
+#define MAX_ECANCELED_RETRY 100
+  for (i = 0; i < MAX_ECANCELED_RETRY; i++) {
     if (ret == -ECANCELED) {
       obj_ctx.invalidate(olh_obj);
     }
@@ -5969,7 +5971,15 @@ int RGWRados::set_olh(RGWObjectCtx& obj_ctx, RGWBucketInfo& bucket_info, rgw_obj
       ldout(cct, 20) << "update_olh() target_obj=" << target_obj << " returned " << ret << dendl;
       continue;
     }
-  } while (ret == -ECANCELED);
+    if (ret != -ECANCELED) {
+      break;
+    }
+  }
+
+  if (i == MAX_ECANCELED_RETRY) {
+    ldout(cct, 0) << "ERROR: exceeded max ECANCELED retries, aborting (EIO)" << dendl;
+    return -EIO;
+  }
 
   if (ret < 0) {
     return ret;
@@ -5989,8 +5999,9 @@ int RGWRados::unlink_obj_instance(RGWObjectCtx& obj_ctx, RGWBucketInfo& bucket_i
   RGWObjState *state = NULL;
 
   int ret = 0;
+  int i;
 
-  do {
+  for (i = 0; i < MAX_ECANCELED_RETRY; i++) {
     if (ret == -ECANCELED) {
       obj_ctx.invalidate(olh_obj);
     }
@@ -6016,7 +6027,15 @@ int RGWRados::unlink_obj_instance(RGWObjectCtx& obj_ctx, RGWBucketInfo& bucket_i
       ldout(cct, 20) << "update_olh() target_obj=" << target_obj << " returned " << ret << dendl;
       continue;
     }
-  } while (ret == -ECANCELED);
+    if (ret != -ECANCELED) {
+      break;
+    }
+  }
+
+  if (i == MAX_ECANCELED_RETRY) {
+    ldout(cct, 0) << "ERROR: exceeded max ECANCELED retries, aborting (EIO)" << dendl;
+    return -EIO;
+  }
 
   if (ret < 0) {
     return ret;