rgw: es_obj_metadata encode instance "null" for none-version obj

full-sync will get "null" for instance, but inc-sync will get
empty string, so keep the same

fixes: http://tracker.ceph.com/issues/23841

Signed-off-by: Shang Ding <dingshang@xsky.com>
(cherry picked from commit 0e965ad796acd6bcbc92074dab0d4e9c127dab46)

diff --git a/src/rgw/rgw_sync_module_es.cc b/src/rgw/rgw_sync_module_es.cc
index be6d1f18a8bd47ee9aaddb3b7a0d658820276970..0bf2360bac287d8fc4d413b6d3e998236c1ed17f 100644 (file)
--- a/src/rgw/rgw_sync_module_es.cc
+++ b/src/rgw/rgw_sync_module_es.cc
@@ -352,7 +352,10 @@ struct es_obj_metadata {
     }
     ::encode_json("bucket", bucket_info.bucket.name, f);
     ::encode_json("name", key.name, f);
-    ::encode_json("instance", key.instance, f);
+    string instance = key.instance;
+    if (instance.empty())
+      instance = "null";
+    ::encode_json("instance", instance, f);
     ::encode_json("versioned_epoch", versioned_epoch, f);
     ::encode_json("owner", policy.get_owner(), f);
     ::encode_json("permissions", permissions, f);