]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: return x-amz-version-id: null when delete obj in versioning 23927/head
authoryuliyang <yuliyang@cmss.chinamobile.com>
Wed, 5 Sep 2018 06:18:44 +0000 (14:18 +0800)
committeryuliyang <yuliyang@cmss.chinamobile.com>
Thu, 6 Sep 2018 15:05:01 +0000 (23:05 +0800)
suspended bucket

fix http://tracker.ceph.com/issues/35814

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
src/rgw/rgw_rados.cc

index b9a07a827cd24bcf2b3be3c1f6f241c57a362bb0..05b098129280a54d6e2d1afd880e4ef8dcf35ba1 100644 (file)
@@ -9175,6 +9175,8 @@ int RGWRados::Object::Delete::delete_obj()
       }
 
       result.version_id = marker.key.instance;
+      if (result.version_id.empty())
+        result.version_id = "null";
       result.delete_marker = true;
 
       struct rgw_bucket_dir_entry_meta meta;