rgw: handle 'null' instance when setting delete marker

Don't set 'null' instance for a delete marker. We use empty string for
this specific case.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 6c10e0f4c5fec8590954965f0be270207b0450e7..49fce24d8bb6888b421d77a3dfa582c6c5a1ecb9 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -4022,7 +4022,9 @@ int RGWRados::Object::Delete::delete_obj()
       rgw_obj marker = obj;
 
       if (!params.marker_version_id.empty()) {
-        marker.set_instance(params.marker_version_id);
+        if (params.marker_version_id != "null") {
+          marker.set_instance(params.marker_version_id);
+        }
       } else if ((params.versioning_status & BUCKET_VERSIONS_SUSPENDED) == 0) {
         store->gen_rand_obj_instance_name(&marker);
       }