Changeset 31103 for other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SETUP.bash

Timestamp:

2016-11-11T13:22:02+13:00 (7 years ago)

Author:

davidb

Message:

Changes made after testing with 20 solr nodes

File:

• other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SETUP.bash (modified) (6 diffs)

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SETUP.bash

@@ -1 +1 @@
 
+short_hostname=`hostname -s`
 
 #export SPARK_MASTER_HOST=gchead
@@ -9 +10 @@
 export ZOOKEEPER_SERVER=gchead:8181
 export SOLR_NODES="gc0:8983 gc1:8983 gc2:8983 gc3:8983 gc4:8983 gc5:8983 gc6:8983 gc7:8983 gc8:8983 gc9:8983"
+#export SOLR_NODES="$SOLR_NODES gc0:8984 gc1:8984 gc2:8984 gc3:8984 gc4:8984 gc5:8984 gc6:8984 gc7:8984 gc8:8984 gc9:8984"
 
 export HTRC_EF_PACKAGE_HOME=`pwd`
 
-echo ""
-echo "****"
+if [ "$short_hostname" = "gsliscluster1" ] ; then
+  echo ""
+  echo "****"
+fi
 
 export JAVA_HOME="$HTRC_EF_PACKAGE_HOME/jdk1.8.0"
@@ -23 +27 @@
 #export _JAVA_OPTIONS="-XX:+HeapDumpOnOutOfMemoryError"
 
-echo "* Added in JDK 1.8 into PATH"
+if [ "$short_hostname" = "gsliscluster1" ] ; then
+  echo "* Added in JDK 1.8 into PATH"
+fi
 
 source SETUP/setup-spark.bash
@@ -32 +38 @@
 
 export PATH="$HTRC_EF_PACKAGE_HOME/SCRIPTS:$PATH"
-echo "* Added in HTRC EF PACKAGE remote scripting into PATH"
+if [ "$short_hostname" = "gsliscluster1" ] ; then
+  echo "* Added in HTRC EF PACKAGE remote scripting into PATH"
+fi
 
 spark_conf_slaves="$SPARK_HOME/conf/slaves" 
@@ -45 +53 @@
 else
   slaves=`cat "$spark_conf_slaves" | tr '\n' ' '`
-  echo "****"
-  echo "* Solr slaves: $slaves"
-  echo "****"
+  if [ "$short_hostname" = "gsliscluster1" ] ; then
+    echo "****"
+    echo "* Spark slaves: $slaves"
+    echo "****"
+  fi
 fi
 
@@ -72 +82 @@
   tar xvzf CONF/htrc_configs.tar.gz -C "$solr_configsets"
 fi
+
+if [ "$short_hostname" = "gsliscluster1" ] ; then
+  echo "****"
+  echo "* Solr nodes: $SOLR_NODES"
+  echo "****"
+fi