From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 31 Mar 2017 23:30:56 +0000 (-0700)
Subject: rgw: es: handle get config api in es zone
X-Git-Tag: ses5-milestone6~9^2~3^2~40
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=874223b2516ab8e71be77f1868a9d2d8717e6345;p=ceph.git

rgw: es: handle get config api in es zone

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 8bd4cebd90c..2bc41530913 100644
--- a/src/rgw/rgw_sync_module_es_rest.cc
+++ b/src/rgw/rgw_sync_module_es_rest.cc
@@ -341,10 +341,14 @@ class RGWHandler_REST_MDSearch_S3 : public RGWHandler_REST_S3 {
   RGWElasticSyncModuleInstance *es_module;
 protected:
   RGWOp *op_get() {
-    if (!s->info.args.exists("query")) {
-      return nullptr;
+    if (s->info.args.exists("query")) {
+      return new RGWMetadataSearch_ObjStore_S3(es_module);
     }
-    return new RGWMetadataSearch_ObjStore_S3(es_module);
+    if (!s->init_state.url_bucket.empty() &&
+        s->info.args.exists("mdsearch")) {
+      return new RGWGetBucketMetaSearch_ObjStore_S3;
+    }
+    return nullptr;
   }
   RGWOp *op_head() {
     return nullptr;