From 96ab11ab16ac0972086f27121fee3c24cc55aa04 Mon Sep 17 00:00:00 2001
From: yuliyang <yuliyang@cmss.chinamobile.com>
Date: Wed, 5 Sep 2018 14:18:44 +0800
Subject: [PATCH] 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)
---
 src/rgw/rgw_rados.cc | 2 ++
 1 file changed, 2 insertions(+)

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;
-- 
2.47.3