From: yuliyang <yuliyang@cmss.chinamobile.com>
Date: Wed, 5 Sep 2018 06:18:44 +0000 (+0800)
Subject: luminous:rgw: return x-amz-version-id: null when delete obj in versioning
X-Git-Tag: v12.2.9~72^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96ab11ab16ac0972086f27121fee3c24cc55aa04;p=ceph.git

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 bd9fdf2a1a37d..dbf96e782635f 100644
--- 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;