From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 4 Apr 2017 19:02:41 +0000 (-0700)
Subject: rgw: es: add a configurable to override index path
X-Git-Tag: ses5-milestone6~9^2~3^2~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fbae80ba509df9572be9943d319ab116e40983a4;p=ceph.git

rgw: es: add a configurable to override index path

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

diff --git a/src/rgw/rgw_sync_module_es.cc b/src/rgw/rgw_sync_module_es.cc
index e81c61ba5b96..0ab7ad40293b 100644
--- a/src/rgw/rgw_sync_module_es.cc
+++ b/src/rgw/rgw_sync_module_es.cc
@@ -103,12 +103,18 @@ struct ElasticConfig {
   string index_path;
   RGWRESTConn *conn{nullptr};
   bool explicit_custom_meta{true};
+  string override_index_path;
   ItemList index_buckets;
   ItemList allow_owners;
 
   void init_instance(RGWRealm& realm, uint64_t instance_id) {
     sync_instance = instance_id;
 
+    if (!override_index_path.empty()) {
+      index_path = override_index_path;
+      return;
+    }
+
     char buf[32];
     snprintf(buf, sizeof(buf), "-%08x", (uint32_t)(sync_instance & 0xFFFFFFFF));
 
@@ -452,6 +458,7 @@ public:
     conf->explicit_custom_meta = rgw_conf_get_bool(config, "explicit_custom_meta", true);
     conf->index_buckets.init(rgw_conf_get(config, "index_buckets_list", ""), true); /* approve all buckets by default */
     conf->allow_owners.init(rgw_conf_get(config, "approved_owners_list", ""), true); /* approve all bucket owners by default */
+    conf->override_index_path = rgw_conf_get(config, "override_index_path", "");
   }
   ~RGWElasticDataSyncModule() override {
     delete conf->conn;