]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: RGWGetObj applies skip_manifest flag to SLO
authorCasey Bodley <cbodley@redhat.com>
Mon, 13 Mar 2017 15:33:02 +0000 (11:33 -0400)
committerNathan Cutler <ncutler@suse.com>
Mon, 19 Jun 2017 20:50:22 +0000 (22:50 +0200)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 987377ae34382e107e1d54f0bfc1121fcedb4513)

src/rgw/rgw_op.cc

index 299c3de72a4f37eb7877f8d0da702c34c5092de8..df7ecd58e2515c43e3f0ccffd4e2ec7e9bdc763f 100644 (file)
@@ -1431,7 +1431,7 @@ void RGWGetObj::execute()
     return;
   }
   attr_iter = attrs.find(RGW_ATTR_SLO_MANIFEST);
-  if (attr_iter != attrs.end()) {
+  if (attr_iter != attrs.end() && !skip_manifest) {
     is_slo = true;
     op_ret = handle_slo_manifest(attr_iter->second);
     if (op_ret < 0) {