diff options
| author | Gregory Farnum <greg@inktank.com> | 2013-07-16 15:17:25 -0700 |
|---|---|---|
| committer | Gregory Farnum <greg@inktank.com> | 2013-07-16 15:17:25 -0700 |
| commit | c449a8b3257e6be2916d229f91cb10910f01d854 (patch) | |
| tree | 8c76b22a9ebfa32d2b21c9ad6f149b8207f9b6e2 | |
| parent | 5eac38797d9eb5a59fcff1d81571cff7a2f10e66 (diff) | |
| parent | 72d4351ea5a470051e428ffc5531acfc7d1c7b6f (diff) | |
| download | ceph-c449a8b3257e6be2916d229f91cb10910f01d854.tar.gz | |
Merge pull request #439 from yehudasa/wip-rgw-next
rgw: quiet down ECANCELED on put_obj_meta()
Reviewed-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/rgw/rgw_rados.cc | 5 |
1 files changed, 5 insertions, 0 deletions
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; } |