luminous:rgw: return x-amz-version-id: null when delete obj in versioning

suspended bucket

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

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
(cherry picked from commit 9c39147)

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index bd9fdf2a1a37dc166d4f177cfd4eddc7b9d7bb70..dbf96e782635fce5e9efb214a8c26d3a08e1c848 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -9051,6 +9051,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;