From: Radoslaw Zarzynski Date: Tue, 10 May 2016 15:45:20 +0000 (+0200) Subject: rgw: handle errors properly during GET on Swift's DLO. X-Git-Tag: v0.94.8~35^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ce313cd89e29c0cfc6b7c600a82bdea7b351cdbd;p=ceph.git rgw: handle errors properly during GET on Swift's DLO. Backport: Jewel, Hammer Fixes: http://tracker.ceph.com/issues/15812 Signed-off-by: Radoslaw Zarzynski (cherry picked from commit 5ef0202a86a1e4cb56bd29d926555f114a1acdd8) Conflicts: src/rgw/rgw_op.cc (hammer uses ret instead of op_ret; enclosing if block in hammer does not check skip_manifest) --- diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index dd413dd3c8c04..2d9a60e95cba6 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -942,6 +942,7 @@ void RGWGetObj::execute() ret = handle_user_manifest(attr_iter->second.c_str()); if (ret < 0) { ldout(s->cct, 0) << "ERROR: failed to handle user manifest ret=" << ret << dendl; + goto done_err; } return; }