From 72d4351ea5a470051e428ffc5531acfc7d1c7b6f Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Tue, 16 Jul 2013 13:42:03 -0700 Subject: [PATCH] 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 --- src/rgw/rgw_rados.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index c9d6c70980b..5e305cbf29a 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; } -- 2.47.3