Skip to content

Commit

Permalink
rgw: handle errors properly during GET on Swift's DLO.
Browse files Browse the repository at this point in the history
Backport: Jewel, Hammer
Fixes: http://tracker.ceph.com/issues/15812
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 5ef0202)

Conflicts:
	src/rgw/rgw_op.cc (hammer uses ret instead of op_ret; enclosing if
			   block in hammer does not check skip_manifest)
  • Loading branch information
rzarzynski authored and smithfarm committed May 31, 2016
1 parent a336291 commit ce313cd
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/rgw/rgw_op.cc
Expand Up @@ -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;
}
Expand Down

0 comments on commit ce313cd

Please sign in to comment.