From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 22 Mar 2017 00:44:56 +0000 (-0700)
Subject: rgw: also dump custom meta entries
X-Git-Tag: ses5-milestone6~9^2~3^2~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0180650d09118ebe97154998fbe98c69ff96d7d6;p=ceph.git

rgw: also dump custom meta entries

when doing metadata search

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

diff --git a/src/rgw/rgw_sync_module_es_rest.cc b/src/rgw/rgw_sync_module_es_rest.cc
index f0f2ec65c71..458e0630265 100644
--- a/src/rgw/rgw_sync_module_es_rest.cc
+++ b/src/rgw/rgw_sync_module_es_rest.cc
@@ -210,6 +210,14 @@ public:
       dump_time(s, "LastModified", &e.meta.mtime);
       s->formatter->dump_format("ETag", "\"%s\"", e.meta.etag.c_str());
       dump_owner(s, e.owner.get_id(), e.owner.get_display_name());
+      s->formatter->open_array_section("CustomMetadata");
+      for (auto& m : e.meta.custom_str) {
+        s->formatter->open_object_section("Entry");
+        s->formatter->dump_string("Name", m.first.c_str());
+        s->formatter->dump_string("Value", m.second);
+        s->formatter->close_section();
+      }
+      s->formatter->close_section();
       s->formatter->close_section();
       rgw_flush_formatter(s, s->formatter);
     };