From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 25 Jul 2018 22:41:42 +0000 (-0700)
Subject: rgw: pubsub: adjust event encoding
X-Git-Tag: v14.1.0~616^2~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b72879d4694bf1d12afe0c48114647a53d56e458;p=ceph.git

rgw: pubsub: adjust event encoding

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

diff --git a/src/rgw/rgw_sync_module_pubsub.cc b/src/rgw/rgw_sync_module_pubsub.cc
index 98124e33b820..1e82c3bae5d9 100644
--- a/src/rgw/rgw_sync_module_pubsub.cc
+++ b/src/rgw/rgw_sync_module_pubsub.cc
@@ -351,8 +351,17 @@ struct objstore_event {
   }
 
   void dump(Formatter *f) const {
-    encode_json("bucket", bucket, f);
-    encode_json("key", key, f);
+    {
+      Formatter::ObjectSection s(*f, "bucket");
+      encode_json("name", bucket.name, f);
+      encode_json("tenant", bucket.tenant, f);
+      encode_json("bucket_id", bucket.bucket_id, f);
+    }
+    {
+      Formatter::ObjectSection s(*f, "key");
+      encode_json("name", key.name, f);
+      encode_json("instance", key.instance, f);
+    }
     utime_t mt(mtime);
     encode_json("mtime", mt, f);
     Formatter::ObjectSection s(*f, "attrs");