]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: es: handle get config api in es zone
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 31 Mar 2017 23:30:56 +0000 (16:30 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Tue, 30 May 2017 20:24:45 +0000 (13:24 -0700)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_sync_module_es_rest.cc

index 8bd4cebd90c2e1a73f91014e87f07c92f4d375c8..2bc41530913b0a524b5de3436e3cd51da096f12c 100644 (file)
@@ -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;