From 03f2d0cf22445e82a9cfb79cfd78bf819616494a Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 7 Jan 2015 17:21:14 -0800 Subject: [PATCH] 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 --- src/rgw/rgw_rados.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 6c10e0f4c5fec..49fce24d8bb68 100644 --- 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); } -- 2.39.5