Repository: ambari
Updated Branches:
  refs/heads/trunk e9cfce9c3 -> 3a98919ee


 AMBARI-16444. Solr collection router field is not configurable in solr-client 
(oleewere)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3a98919e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a98919e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a98919e

Branch: refs/heads/trunk
Commit: 3a98919ee6cefbf4b9ac17f3619285e82e438c21
Parents: e9cfce9
Author: oleewere <oleew...@gmail.com>
Authored: Thu May 12 14:16:24 2016 +0200
Committer: oleewere <oleew...@gmail.com>
Committed: Thu May 12 14:19:03 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/ambari/logsearch/solr/AmbariSolrCloudCLI.java  | 2 +-
 .../LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3a98919e/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudCLI.java
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudCLI.java
 
b/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudCLI.java
index 74ea547..21e7fee 100644
--- 
a/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudCLI.java
+++ 
b/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudCLI.java
@@ -242,7 +242,7 @@ public class AmbariSolrCloudCLI {
       int interval = cli.hasOption('i') ? 
Integer.parseInt(cli.getOptionValue('i')) : 10;
       int maxShards = cli.hasOption('m') ? 
Integer.parseInt(cli.getOptionValue('m')) : shards * replication;
       String routerName = cli.hasOption("rn") ? cli.getOptionValue("rn") : 
"implicit";
-      String routerField = cli.hasOption("rn") ? cli.getOptionValue("rn") : 
"_router_field_";
+      String routerField = cli.hasOption("rf") ? cli.getOptionValue("rf") : 
"_router_field_";
       String shardName = cli.hasOption("sn") ? cli.getOptionValue("sn") : null;
       boolean isSplitting = !cli.hasOption("ns");
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3a98919e/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
index ce53692..8444d19 100644
--- 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
@@ -99,7 +99,7 @@
 
   <property>
     <name>logsearch_solr_znode</name>
-    <value>/logsearch</value>
+    <value>/ambari-solr</value>
     <description>Zookeeper znode, e.g: /logsearch</description>
     <display-name>Logsearch Solr ZNode</display-name>
     <value-attributes>

Reply via email to