Changeset 31233 for other-projects

Timestamp:

2016-12-14T11:12:29+13:00 (7 years ago)

Author:

davidb

Message:

Changes to operate on nema as well as gsliscluster1 and gc0-9

File:

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

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

@@ -8 +8 @@
 export SPARK_SLAVE_HOSTS="gc0 gc1 gc2 gc3 gc4 gc5 gc6 gc7 gc8 gc9"
 
-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"
+if [ "$short_hostname" = "nema" ] ; then
+  export ZOOKEEPER_SERVER=localhost:8181
+  export SOLR_NODES="localhost:8983 localhost:8984 localhost:8985 localhost:8986 localhost:8987 localhost:8988 localhost:8989 localhost:8990 localhost:8991 localhost:8992"
+else 
+  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"
+fi
+
+
 
 export HTRC_EF_PACKAGE_HOME=`pwd`
@@ -31 +38 @@
 fi
 
-source SETUP/setup-spark.bash
+if [ "$short_hostname" != "nema" ] ; then
+  source SETUP/setup-spark.bash
+fi
 
 source SETUP/setup-zookeeper.bash 
@@ -42 +51 @@
 fi
 
-spark_conf_slaves="$SPARK_HOME/conf/slaves" 
-if [ ! -f "$spark_conf_slaves" ] ; then
-  echo "****"
-  echo "* Populatig $spark_conf_slaves" 
-  echo "* With: $SPARK_SLAVE_HOSTS"
-  echo "****"
-  for s in $SPARK_SLAVE_HOSTS ; do
-    echo $s >> "$spark_conf_slaves"
-  done
-else
-  slaves=`cat "$spark_conf_slaves" | tr '\n' ' '`
-  if [ "$short_hostname" = "gsliscluster1" ] ; then
+if [ "$short_hostname" != "nema" ] ; then
+  spark_conf_slaves="$SPARK_HOME/conf/slaves" 
+  if [ ! -f "$spark_conf_slaves" ] ; then
     echo "****"
-    echo "* Spark slaves: $slaves"
+    echo "* Populatig $spark_conf_slaves" 
+    echo "* With: $SPARK_SLAVE_HOSTS"
     echo "****"
+    for s in $SPARK_SLAVE_HOSTS ; do
+      echo $s >> "$spark_conf_slaves"
+    done
+  else
+    slaves=`cat "$spark_conf_slaves" | tr '\n' ' '`
+    if [ "$short_hostname" = "gsliscluster1" ] ; then
+      echo "****"
+      echo "* Spark slaves: $slaves"
+      echo "****"
+    fi
   fi
 fi