rgw: swift shouldn't change obj storage policy during change obj meta

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
ceph · Jul 18, 2017 · 2326e8a · 2326e8a
1 parent b39a402
commit 2326e8a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
@@ -3997,6 +3997,13 @@ void RGWPutMetadataObject::execute()
   }
 
   rgw_get_request_metadata(s->cct, s->info, attrs);
+
+  if (!requested_placement_id.empty() &&
+      requested_placement_id != s->bucket_info.placement_rule) {
+    op_ret = -EEXIST;
+    return;
+  }
+
   /* check if obj exists, read orig attrs */
   op_ret = get_obj_attrs(store, s, obj, orig_attrs);
   if (op_ret < 0) {

diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
@@ -1193,7 +1193,7 @@ class RGWPutMetadataBucket : public RGWOp {
 class RGWPutMetadataObject : public RGWOp {
 protected:
   RGWAccessControlPolicy policy;
-  string placement_rule;
+  std::string requested_placement_id;
   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
@@ -943,7 +943,7 @@ int RGWPutMetadataObject_ObjStore_SWIFT::get_params()
     return r;
   }
 
-  placement_rule = s->info.env->get("HTTP_X_STORAGE_POLICY", "");
+  requested_placement_id = s->info.env->get("HTTP_X_STORAGE_POLICY", "");
   dlo_manifest = s->info.env->get("HTTP_X_OBJECT_MANIFEST");
 
   return 0;