Преглед изворни кода

AMBARI-17521. If Solr is configured to use implicit routing, then replicationFactor is ignored (Bosco Durai via oleewere)

oleewere пре 9 година
родитељ
комит
4fd42bafad

+ 1 - 1
ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/logfeeder.properties

@@ -17,7 +17,7 @@ logfeeder.checkpoint.folder=
 logfeeder.metrics.collector.hosts=
 logfeeder.metrics.collector.hosts=
 
 
 #filter config
 #filter config
-logfeeder.log.filter.enable=true
+logfeeder.log.filter.enable=false
 logfeeder.solr.config.interval=5
 logfeeder.solr.config.interval=5
 logfeeder.solr.zk_connect_string=
 logfeeder.solr.zk_connect_string=
 logfeeder.solr.url=
 logfeeder.solr.url=

+ 1 - 1
ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/run.sh

@@ -64,7 +64,7 @@ LOGFEEDER_GC_OPTS="-XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$LOGFEEDER
 
 
 #JMX="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=2098"
 #JMX="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=2098"
 
 
-if [ $LOGFEEDER_SSL = "true" ]; then
+if [ "$LOGFEEDER_SSL" = "true" ]; then
   LOGFEEDER_JAVA_OPTS="$LOGFEEDER_JAVA_OPTS -Djavax.net.ssl.keyStore=$LOGFEEDER_KEYSTORE_LOCATION -Djavax.net.ssl.keyStoreType=$LOGFEEDER_KEYSTORE_TYPE -Djavax.net.ssl.keyStorePassword=$LOGFEEDER_KEYSTORE_PASSWORD -Djavax.net.ssl.trustStore=$LOGFEEDER_TRUSTSTORE_LOCATION -Djavax.net.ssl.trustStoreType=$LOGFEEDER_TRUSTSTORE_TYPE -Djavax.net.ssl.trustStorePassword=$LOGFEEDER_TRUSTSTORE_PASSWORD"
   LOGFEEDER_JAVA_OPTS="$LOGFEEDER_JAVA_OPTS -Djavax.net.ssl.keyStore=$LOGFEEDER_KEYSTORE_LOCATION -Djavax.net.ssl.keyStoreType=$LOGFEEDER_KEYSTORE_TYPE -Djavax.net.ssl.keyStorePassword=$LOGFEEDER_KEYSTORE_PASSWORD -Djavax.net.ssl.trustStore=$LOGFEEDER_TRUSTSTORE_LOCATION -Djavax.net.ssl.trustStoreType=$LOGFEEDER_TRUSTSTORE_TYPE -Djavax.net.ssl.trustStorePassword=$LOGFEEDER_TRUSTSTORE_PASSWORD"
 fi
 fi
 
 

+ 4 - 5
ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java

@@ -248,7 +248,7 @@ public abstract class SolrDaoBase {
           numberOfShards, replicationFactor, allCollectionList);
           numberOfShards, replicationFactor, allCollectionList);
       } else {
       } else {
         result = setupCollectionsWithImplicitRouting(splitMode,
         result = setupCollectionsWithImplicitRouting(splitMode,
-          configName, numberOfShards, allCollectionList);
+          configName, numberOfShards, replicationFactor, allCollectionList);
       }
       }
     } catch (Exception ex) {
     } catch (Exception ex) {
       logger.error("Error creating collection. collectionName="
       logger.error("Error creating collection. collectionName="
@@ -279,16 +279,16 @@ public abstract class SolrDaoBase {
   }
   }
 
 
   public boolean setupCollectionsWithImplicitRouting(String splitMode,
   public boolean setupCollectionsWithImplicitRouting(String splitMode,
-                                                     String configName, int numberOfShards,
+                                                     String configName, int numberOfShards, int replicationFactor,
                                                      List<String> allCollectionList) throws Exception {
                                                      List<String> allCollectionList) throws Exception {
     logger.info("setupCollectionsWithImplicitRouting(). collectionName="
     logger.info("setupCollectionsWithImplicitRouting(). collectionName="
       + collectionName + ", numberOfShards=" + numberOfShards);
       + collectionName + ", numberOfShards=" + numberOfShards);
     return createCollectionWithImplicitRoute(collectionName, configName,
     return createCollectionWithImplicitRoute(collectionName, configName,
-      numberOfShards, allCollectionList);
+      numberOfShards, replicationFactor, allCollectionList);
   }
   }
 
 
   public boolean createCollectionWithImplicitRoute(String colName,
   public boolean createCollectionWithImplicitRoute(String colName,
-                                                   String configName, int numberOfShards,
+                                                   String configName, int numberOfShards, int replicationFactor,
                                                    List<String> allCollectionList) throws SolrServerException,
                                                    List<String> allCollectionList) throws SolrServerException,
     IOException {
     IOException {
 
 
@@ -310,7 +310,6 @@ public abstract class SolrDaoBase {
     if (!allCollectionList.contains(colName)) {
     if (!allCollectionList.contains(colName)) {
       logger.info("Creating collection " + colName + ", shardsList="
       logger.info("Creating collection " + colName + ", shardsList="
         + shardsList + ", solrDetail=" + solrDetail);
         + shardsList + ", solrDetail=" + solrDetail);
-      int replicationFactor = 1;
       CollectionAdminRequest.Create collectionCreateRequest = new CollectionAdminRequest.Create();
       CollectionAdminRequest.Create collectionCreateRequest = new CollectionAdminRequest.Create();
       collectionCreateRequest.setCollectionName(colName);
       collectionCreateRequest.setCollectionName(colName);
       collectionCreateRequest.setRouterName("implicit");
       collectionCreateRequest.setRouterName("implicit");