[ambari] branch trunk updated: AMBARI-24125. Infra Solr migration: fix config set + node name in restore command.

[ol...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 8a80ada  AMBARI-24125. Infra Solr migration: fix config set + node name in restore command.
8a80ada is described below

commit 8a80ada9d2bff6ae54a523805e4f3d1c569bb738
Author: Oliver Szabo <ol...@gmail.com>
AuthorDate: Mon Jun 18 15:46:14 2018 +0200

    AMBARI-24125. Infra Solr migration: fix config set + node name in restore command.
---
 .../AMBARI_INFRA_SOLR/0.1.0/package/scripts/collection.py             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/collection.py b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/collection.py
index ca9c19a..e16a1bc 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/collection.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/collection.py
@@ -157,7 +157,7 @@ def restore_collection(env):
     core_details = core_data[target_core]['properties']
     core_properties = {}
     core_properties['numShards'] = core_details['numShards']
-    core_properties['collection.configName'] = "ranger_audits" # TODO
+    core_properties['collection.configName'] = command_commons.solr_restore_config_set
     core_properties['name'] = target_core
     core_properties['replicaType'] = core_details['replicaType']
     core_properties['collection'] = command_commons.collection
@@ -167,7 +167,7 @@ def restore_collection(env):
       core_properties['coreNodeName'] = core_details['coreNodeName']
     core_properties['shard'] = core_details['shard']
     if command_commons.solr_hdfs_path:
-      hdfs_solr_node_folder=command_commons.solr_hdfs_path + format("/backup_{collection}/") + core_details['node']
+      hdfs_solr_node_folder=command_commons.solr_hdfs_path + format("/backup_{collection}/") + core_details['coreNodeName']
       source_folder=format("{index_location}/snapshot.{src_core}/")
       if command_commons.check_folder_exists(source_folder):
         hdfs_cores_on_host.append(target_core)

-- 
To stop receiving notification emails like this one, please contact
oleewere@apache.org.