From: Yehuda Sadeh <yehuda@inktank.com>
Date: Tue, 16 Jul 2013 20:42:03 +0000 (-0700)
Subject: rgw: quiet down ECANCELED on put_obj_meta()
X-Git-Tag: v0.67-rc1~60^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=72d4351ea5a470051e428ffc5531acfc7d1c7b6f;p=ceph.git

rgw: quiet down ECANCELED on put_obj_meta()

Fixes: #5439

ECANCELED there means that we lost in a race to write the object. We
should treat it as a successful write. This is reviving an old behavior
that was changed inadvertently.

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

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index c9d6c70980b3..5e305cbf29a6 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -2301,6 +2301,11 @@ done_cancel:
   if (ret < 0) {
     ldout(cct, 0) << "ERROR: complete_update_index_cancel() returned ret=" << ret << dendl;
   }
+  /* we lost in a race, object was already overwritten, we
+   * should treat it as a success
+   */
+  if (r == -ECANCELED)
+    r = 0;
   return r;
 }