BIGTOP-4301: Install Solr with tarball

apache · Dec 10, 2024 · a7f4b35 · a7f4b35
1 parent faa3f19
commit a7f4b35
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 308 deletions.
diff --git a/...-server/src/main/resources/stacks/bigtop/3.3.0/services/solr/configuration/solr-log4j.xml b/...-server/src/main/resources/stacks/bigtop/3.3.0/services/solr/configuration/solr-log4j.xml
diff --git a/...er-server/src/main/resources/stacks/bigtop/3.3.0/services/solr/configuration/solr-xml.xml b/...er-server/src/main/resources/stacks/bigtop/3.3.0/services/solr/configuration/solr-xml.xml
@@ -18,74 +18,6 @@
   ~ under the License.
 -->
 <configuration>
-    <property>
-        <name>maxBooleanClauses</name>
-        <value>${solr.max.booleanClauses:1024}</value>
-    </property>
-    <property>
-        <name>sharedLib</name>
-        <value>${solr.sharedLib:}</value>
-    </property>
-    <property>
-        <name>allowPaths</name>
-        <value>${solr.allowPaths:}</value>
-    </property>
-    <property>
-        <name>host</name>
-        <value>${host:}</value>
-    </property>
-    <property>
-        <name>hostPort</name>
-        <value>${solr.port.advertise:0}</value>
-    </property>
-    <property>
-        <name>hostContext</name>
-        <value>${hostContext:solr}</value>
-    </property>
-    <property>
-        <name>genericCoreNodeNames</name>
-        <value>${genericCoreNodeNames:true}</value>
-    </property>
-    <property>
-        <name>zkClientTimeout</name>
-        <value>${zkClientTimeout:30000}</value>
-    </property>
-    <property>
-        <name>distribUpdateSoTimeout</name>
-        <value>${distribUpdateSoTimeout:600000}</value>
-    </property>
-    <property>
-        <name>distribUpdateConnTimeout</name>
-        <value>${distribUpdateConnTimeout:60000}</value>
-    </property>
-    <property>
-        <name>zkCredentialsProvider</name>
-        <value>${zkCredentialsProvider:org.apache.solr.common.cloud.DefaultZkCredentialsProvider}</value>
-    </property>
-    <property>
-        <name>zkCredentialsProvider</name>
-        <value>${zkCredentialsProvider:org.apache.solr.common.cloud.DefaultZkCredentialsProvider}</value>
-    </property>
-    <property>
-        <name>zkACLProvider</name>
-        <value>${zkACLProvider:org.apache.solr.common.cloud.DefaultZkACLProvider}</value>
-    </property>
-    <property>
-        <name>socketTimeout</name>
-        <value>${socketTimeout:600000}</value>
-    </property>
-    <property>
-        <name>connTimeout</name>
-        <value>${connTimeout:60000}</value>
-    </property>
-    <property>
-        <name>shardsWhitelist</name>
-        <value>${solr.shardsWhitelist:}</value>
-    </property>
-    <property>
-        <name>metricsenabled</name>
-        <value>{metricsEnabled:true</value>
-    </property>
     <property>
         <name>content</name>
         <display-name>solr-xml template</display-name>
@@ -94,29 +26,31 @@
             <type>longtext</type>
         </attrs>
         <value><![CDATA[
+<#noparse>
 <solr>
-  <int name="maxBooleanClauses">${maxBooleanClauses}</int>
-  <str name="sharedLib">${sharedLib}</str>
-  <str name="allowPaths">${allowPaths}</str>
+  <int name="maxBooleanClauses">${solr.max.booleanClauses:1024}</int>
+  <str name="sharedLib">${solr.sharedLib:}</str>
+  <str name="allowPaths">${solr.allowPaths:}</str>
   <solrcloud>
-    <str name="host">${host}</str>
-    <int name="hostPort">${hostPort}</int>
-    <str name="hostContext">${hostContext}</str>
-    <bool name="genericCoreNodeNames">${genericCoreNodeNames}</bool>
-    <int name="zkClientTimeout">${zkClientTimeout}</int>
-    <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout}</int>
-    <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout}</int>
-    <str name="zkCredentialsProvider">${zkCredentialsProvider}</str>
-    <str name="zkACLProvider">${zkACLProvider}</str>
+    <str name="host">${host:}</str>
+    <int name="hostPort">${solr.port.advertise:0}</int>
+    <str name="hostContext">${hostContext:solr}</str>
+    <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
+    <int name="zkClientTimeout">${zkClientTimeout:30000}</int>
+    <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:600000}</int>
+    <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:60000}</int>
+    <str name="zkCredentialsProvider">${zkCredentialsProvider:org.apache.solr.common.cloud.DefaultZkCredentialsProvider}</str>
+    <str name="zkACLProvider">${zkACLProvider:org.apache.solr.common.cloud.DefaultZkACLProvider}</str>
   </solrcloud>
   <shardHandlerFactory name="shardHandlerFactory"
     class="HttpShardHandlerFactory">
-    <int name="socketTimeout">${socketTimeout}</int>
-    <int name="connTimeout">${connTimeout}</int>
-    <str name="shardsWhitelist">${shardsWhitelist}</str>
+    <int name="socketTimeout">${socketTimeout:600000}</int>
+    <int name="connTimeout">${connTimeout:60000}</int>
+    <str name="shardsWhitelist">${solr.shardsWhitelist:}</str>
   </shardHandlerFactory>
-  <metrics enabled="${metricsenabled}"/>
+  <metrics enabled="${metricsEnabled:true}"/>
 </solr>
+</#noparse>
       ]]>
         </value>
     </property>

diff --git a/.../services/solr/configuration/solr-env.xml → ...0/services/solr/configuration/solr.in.xml b/.../services/solr/configuration/solr-env.xml → ...0/services/solr/configuration/solr.in.xml
@@ -42,18 +42,6 @@
         <description>Directory for Solr logs</description>
     </property>
 
-    <property>
-        <name>solr_user</name>
-        <value>solr</value>
-        <description>Solr user</description>
-    </property>
-
-    <property>
-        <name>solr_datadir</name>
-        <value>/var/lib/solr/data</value>
-        <description>Directory for storting Solr index. Make sure you have enough disk space</description>
-    </property>
-
     <property>
         <name>solr_ssl_enabled</name>
         <value>false</value>
@@ -199,19 +187,19 @@
 
     <property>
         <name>solr_extra_java_opts</name>
-        <value></value>
+        <value />
         <description>Extra Solr java options (e.g.: -Dproperty=value), that will be added to SOLR_OPTS environment
             variable
         </description>
     </property>
 
     <property>
         <name>solr_gc_log_opts</name>
-        <value></value>
+        <value />
     </property>
     <property>
         <name>solr_gc_tune</name>
-        <value></value>
+        <value />
     </property>
     <property>
         <name>solr_min_mem</name>
@@ -226,11 +214,11 @@
         <value>false</value>
     </property>
 
-    <!-- solr-env.sh -->
+    <!-- solr.in.sh -->
     <property>
         <name>content</name>
-        <display-name>solr-env template</display-name>
-        <description>This is the freemarker template for solr-env.sh file</description>
+        <display-name>solr.in template</display-name>
+        <description>This is the freemarker template for solr.in.sh file</description>
         <attrs>
             <type>longtext</type>
         </attrs>
@@ -288,12 +276,12 @@ SOLR_PID_DIR=${solr_pid_dir}
 
 # Path to a directory where Solr creates index files, the specified directory
 # must contain a solr.xml; by default, Solr will use server/solr
-SOLR_HOME=${solr_datadir}
+SOLR_HOME=${solr_home}/server/solr
 
 # Solr provides a default Log4J configuration properties file in server/resources
 # however, you may want to customize the log settings and file appender location
 # so you can point the script to use a different log4j.properties file
-LOG4J_PROPS=/etc/solr/conf/log4j2.xml
+LOG4J_PROPS=${solr_home}/server/resources/log4j2.xml
 
 # Location where Solr should write logs to; should agree with the file appender
 # settings in server/resources/log4j.properties

diff --git a/...op/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/solr/SolrClientScript.java b/...op/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/solr/SolrClientScript.java