Changeset 31082

Show
Ignore:
Timestamp:
08.11.2016 10:38:35 (3 years ago)
Author:
davidb
Message:

Changes in response to testing on gchead

Location:
other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SCRIPTS/remote-spark-start-all.sh

    r31078 r31082  
    11#!/bin/bash 
    22 
    3 ssh $SPARK_MASTER $SPARK_HOME/sbin/start-all.sh  
     3ssh $SPARK_MASTER_HOST $SPARK_HOME/sbin/start-all.sh  
  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SCRIPTS/remote-spark-stop-all.sh

    r31078 r31082  
    11#!/bin/bash 
    22 
    3 ssh $SPARK_MASTER $SPARK_HOME/sbin/stop-all.sh  
     3ssh $SPARK_MASTER_HOST $SPARK_HOME/sbin/stop-all.sh  
  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SETUP.bash

    r31081 r31082  
    11 
    22 
    3 export SPARK_MASTER=gchead 
    4 export SPARK_MASTER_URL=spark://$SPARK_MASTER:7077 
    5 export SPARK_SLAVES="gc1 gc2 gc3 gc4 gc5 gc6 gc7 gc8 gc9" 
     3export SPARK_MASTER_HOST=gchead 
     4export SPARK_MASTER_URL=spark://$SPARK_MASTER_HOST:7077 
     5export SPARK_SLAVE_HOSTS="gc0 gc1 gc2 gc3 gc4 gc5 gc6 gc7 gc8 gc9" 
    66 
    77export ZOOKEEPER_SERVER=gchead:2181 
    8 export SOLR_NODES="gc1:8983 gc2:8983 gc3:8983 gc4:8983 gc5:8983 gc6:8983 gc7:8983 gc8:8983 gc9:8983" 
     8export SOLR_NODES="gc0:8983 gc1:8983 gc2:8983 gc3:8983 gc4:8983 gc5:8983 gc6:8983 gc7:8983 gc8:8983 gc9:8983" 
    99 
    1010export HTRC_EF_PACKAGE_HOME=`pwd` 
     
    1313echo "****" 
    1414 
    15 export PATH="$HTRC_EF_PACKAGE_HOME/jdk1.8.0/bin:$PATH" 
    16 echo "* Added in JDK into PATH" 
     15export JAVA_HOME="$HTRC_EF_PACKAGE_HOME/jdk1.8.0" 
     16export PATH="$JAVA_HOME/bin:$PATH" 
     17echo "* Added in JDK 1.8 into PATH" 
    1718 
    1819source SETUP/setup-spark.bash 
     
    2930  echo "****" 
    3031  echo "* Populatig $spark_conf_slaves"  
    31   echo "* With: $SPARK_SLAVES" 
     32  echo "* With: $SPARK_SLAVE_HOSTS" 
    3233  echo "****" 
    33   for s in $SPARK_SLAVES ; do 
     34  for s in $SPARK_SLAVE_HOSTS ; do 
    3435    echo $s >> "$spark_conf_slaves" 
    3536  done 
     37else 
     38  slaves=`cat "$spark_conf_slaves" | tr '\n' ' '` 
     39  echo "****" 
     40  echo "* Solr slaves: $slaves" 
     41  echo "****" 
    3642fi 
    3743