Merge pull request ceph#16383 from mikulely/1-ban-change-swift-obj-pl…

…acement rgw: drop the unnecessary handling of Swift's X-Storage-Policy on objects Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
tianjiongzhang · Jan 9, 2018 · ad3502f · ad3502f
2 parents ee5c1c3 + 62fb93a
commit ad3502f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
@@ -1208,7 +1208,6 @@ class RGWPutMetadataBucket : public RGWOp {
 class RGWPutMetadataObject : public RGWOp {
 protected:
   RGWAccessControlPolicy policy;
-  string placement_rule;
   boost::optional<ceph::real_time> delete_at;
   const char *dlo_manifest;
 

diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
@@ -1052,7 +1052,6 @@ int RGWPutMetadataObject_ObjStore_SWIFT::get_params()
     return r;
   }
 
-  placement_rule = s->info.env->get("HTTP_X_STORAGE_POLICY", "");
   dlo_manifest = s->info.env->get("HTTP_X_OBJECT_MANIFEST");
 
   return 0;