]> git-server-git.apps.pok.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)
committerCasey Bodley <cbodley@redhat.com>
Mon, 20 Mar 2017 15:51:30 +0000 (11:51 -0400)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/rgw_op.cc

index a209eb06ad12844f0dd6c341726201d49ce5f158..18d613890a964ae80a6b37036e9f2cec04ee2741 100644 (file)
@@ -1456,7 +1456,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) {