From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 13 Mar 2017 15:33:02 +0000 (-0400)
Subject: rgw: RGWGetObj applies skip_manifest flag to SLO
X-Git-Tag: v11.2.1~76^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3d4d5791867009c8c4b4bc867b65a23116653ae;p=ceph.git

rgw: RGWGetObj applies skip_manifest flag to SLO

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 987377ae34382e107e1d54f0bfc1121fcedb4513)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 299c3de72a4..df7ecd58e25 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -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) {