Changeset 31231 for other-projects


Ignore:
Timestamp:
2016-12-13T22:41:54+13:00 (7 years ago)
Author:
davidb
Message:

Changes to allow SOLR to run on nodes in /hdfsd05/dbbridge/solr-ef

Location:
other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SCRIPTS/nema-solr-start-all.sh

    r31106 r31231  
    77  solr_port=${solr_node##*:}
    88
    9   opt_s="-s /tmp/gc$i-solr-ef/solr"
     9#  opt_s="-s /tmp/gc$i-solr-ef/solr"
     10  opt_s="-s /tmp/gc$i-solr-ef"
    1011
    1112  echo "Starting solr cloud node on: $solr_host [port $solr_port]"

  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SCRIPTS/remote-solr-check-local-shardsize-all.sh

    r31105 r31231  
    55echo "Running 'du -hs' on all Solr shards"
    66
     7local_dir="/hdfsd05/dbbridge/solr-ef"
     8
    79for solr_host in $unique_hosts ; do
    8   ssh $solr_host du -hs /tmp/solr-ef/solr/*shard*;
     10#  ssh $solr_host du -hs /tmp/solr-ef/solr/*shard*;
     11  ssh $solr_host du -hs $local_dir/*shard*;
    912done

  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SCRIPTS/remote-solr-rsync2nema-local-shard-all.sh

    r31112 r31231  
    33unique_hosts=`echo $SOLR_NODES | tr ' ' '\n' | sed 's/:.*$//' | sort | uniq`
    44
    5 
     5local_dir="/hdfsd05/dbbridge/solr-ef"
    66
    77for solr_host in $unique_hosts ; do
    88  echo "Running 'rsync' on $solr_host -> nema:/tmp/$solr_host/solr-ef"
    9   ssh $solr_host rsync -pav /tmp/solr-ef/solr nema:/tmp/${solr_host}-solr-ef
     9#  ssh $solr_host rsync -pav /tmp/solr-ef/solr nema:/tmp/${solr_host}-solr-ef
     10  ssh nema "if [ ! -d /tmp/${solr_host}-solr-ef ] ; then mkdir /tmp/${solr_host}-solr-ef ; fi"
     11  ssh $solr_host rsync -pav $local_dir/. nema:/tmp/${solr_host}-solr-ef/.
    1012done

  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SCRIPTS/remote-solr-setup-local-disk-all.sh

    r31105 r31231  
    33unique_hosts=`echo $SOLR_NODES | tr ' ' '\n' | sed 's/:.*$//' | sort | uniq`
    44
     5#local_dir="/tmp/solr-ef"
     6local_dir="/hdfsd05/dbbridge/solr-ef"
    57
    68for solr_host in $unique_hosts ; do
    7   remote_dir="$solr_host:/tmp/solr-ef"
     9  remote_dir="$solr_host:$local_dir"
    810
    911  echo "Running rsync from networked SOLR_HOME to $remote_dir"
    10   rsync -pav "$SOLR_HOME" "$remote_dir"
     12  ssh $solr_host "if [ ! -d $local_dir ] ; then mkdir $local_dir ; fi"
     13  rsync -pav "$SOLR_HOME/." "$remote_dir/."
    1114done

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

    r31104 r31231  
    33run_from_local_disk=1
    44
    5 local_dir="/tmp/solr-ef"
     5#local_dir="/tmp/solr-ef"
     6local_dir="/hdfsd05/dbbridge/solr-ef"
    67
    78
    89if [ $run_from_local_disk = "1" ] ; then
    9   opt_s="-s $local_dir/solr"
     10  opt_s="-s $local_dir"
    1011  export SOLR_HOME=
    1112  echo "****"

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

    r31103 r31231  
    11
    22
     3_SOLR_TOP_LEVEL_HOME="$HTRC_EF_PACKAGE_HOME/solr"
     4#_SOLR_HOME="$_SOLR_TOP_LEVEL_HOME/server/solr"
     5_SOLR_HOME="/hdfsd05/dbbridge/solr-ef"
    36
    4 export PATH="$HTRC_EF_PACKAGE_HOME/solr/bin:$PATH"
    57if [ "$short_hostname" = "gsliscluster1" ] ; then
    6   echo "* Added in Solr into PATH"
     8  echo "* For-each Solr Node"
     9  echo "*   Added Solr bin into PATH"
     10  echo "*     $_SOLR_TOP_LEVEL_HOME/bin"
     11  echo "*   Set Solr node (home) conf dir to:"
     12  echo "*     $_SOLR_HOME"
     13else
     14  # on one of the nodes
     15  export SOLR_TOP_LEVEL_HOME="$_SOLR_TOP_LEVEL_HOME"
     16  export PATH="$SOLR_TOP_LEVEL_HOME/bin:$PATH"
     17
     18  export SOLR_HOME="$_SOLR_HOME"
     19
     20  export SOLR_PID_DIR="$SOLR_HOME"
     21
    722fi
    823
    9 export SOLR_TOP_LEVEL_HOME="$HTRC_EF_PACKAGE_HOME/solr"
    10 export SOLR_HOME="$SOLR_TOP_LEVEL_HOME/server/solr"
    11 if [ "$short_hostname" = "gsliscluster1" ] ; then
    12   echo "* Set Solr node (home) conf dir to:"
    13   echo "*   $SOLR_HOME"
    14 fi
     24#export PATH="$HTRC_EF_PACKAGE_HOME/solr/bin:$PATH"
     25#if [ "$short_hostname" = "gsliscluster1" ] ; then
     26#  echo "* Added in Solr into PATH"
     27#fi
     28#
     29#export SOLR_TOP_LEVEL_HOME="$HTRC_EF_PACKAGE_HOME/solr"
     30#export SOLR_HOME="$SOLR_TOP_LEVEL_HOME/server/solr"
     31#if [ "$short_hostname" = "gsliscluster1" ] ; then
     32#  echo "* Set Solr node (home) conf dir to:"
     33#  echo "*   $SOLR_HOME"
     34#fi
    1535
Note: See TracChangeset for help on using the changeset viewer.