From: Shang Ding <dingshang@xsky.com>
Date: Wed, 11 Apr 2018 10:55:15 +0000 (+0800)
Subject: rgw: es_obj_metadata encode instance "null" for none-version obj
X-Git-Tag: v14.1.0~698^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e965ad796acd6bcbc92074dab0d4e9c127dab46;p=ceph.git

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

diff --git a/src/rgw/rgw_sync_module_es.cc b/src/rgw/rgw_sync_module_es.cc
index c8c7ba715639..1077426e3865 100644
--- a/src/rgw/rgw_sync_module_es.cc
+++ b/src/rgw/rgw_sync_module_es.cc
@@ -356,7 +356,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);