Changeset 31231 for other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SCRIPTS

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/SCRIPTS

Files:

• nema-solr-start-all.sh (modified) (1 diff)
• remote-solr-check-local-shardsize-all.sh (modified) (1 diff)
• remote-solr-rsync2nema-local-shard-all.sh (modified) (1 diff)
• remote-solr-setup-local-disk-all.sh (modified) (1 diff)
• remote-solr-start-all.sh (modified) (1 diff)

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

@@ -7 +7 @@
   solr_port=${solr_node##*:}
 
-  opt_s="-s /tmp/gc$i-solr-ef/solr"
+#  opt_s="-s /tmp/gc$i-solr-ef/solr"
+  opt_s="-s /tmp/gc$i-solr-ef"
 
   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

@@ -5 +5 @@
 echo "Running 'du -hs' on all Solr shards"
 
+local_dir="/hdfsd05/dbbridge/solr-ef"
+
 for solr_host in $unique_hosts ; do
-  ssh $solr_host du -hs /tmp/solr-ef/solr/*shard*;
+#  ssh $solr_host du -hs /tmp/solr-ef/solr/*shard*;
+  ssh $solr_host du -hs $local_dir/*shard*;
 done

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

@@ -3 +3 @@
 unique_hosts=`echo $SOLR_NODES | tr ' ' '\n' | sed 's/:.*$//' | sort | uniq`
 
-
+local_dir="/hdfsd05/dbbridge/solr-ef"
 
 for solr_host in $unique_hosts ; do
   echo "Running 'rsync' on $solr_host -> nema:/tmp/$solr_host/solr-ef"
-  ssh $solr_host rsync -pav /tmp/solr-ef/solr nema:/tmp/${solr_host}-solr-ef
+#  ssh $solr_host rsync -pav /tmp/solr-ef/solr nema:/tmp/${solr_host}-solr-ef
+  ssh nema "if [ ! -d /tmp/${solr_host}-solr-ef ] ; then mkdir /tmp/${solr_host}-solr-ef ; fi"
+  ssh $solr_host rsync -pav $local_dir/. nema:/tmp/${solr_host}-solr-ef/.
 done

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

@@ -3 +3 @@
 unique_hosts=`echo $SOLR_NODES | tr ' ' '\n' | sed 's/:.*$//' | sort | uniq`
 
+#local_dir="/tmp/solr-ef"
+local_dir="/hdfsd05/dbbridge/solr-ef"
 
 for solr_host in $unique_hosts ; do
-  remote_dir="$solr_host:/tmp/solr-ef"
+  remote_dir="$solr_host:$local_dir"
 
   echo "Running rsync from networked SOLR_HOME to $remote_dir"
-  rsync -pav "$SOLR_HOME" "$remote_dir"
+  ssh $solr_host "if [ ! -d $local_dir ] ; then mkdir $local_dir ; fi"
+  rsync -pav "$SOLR_HOME/." "$remote_dir/."
 done

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

@@ -3 +3 @@
 run_from_local_disk=1
 
-local_dir="/tmp/solr-ef"
+#local_dir="/tmp/solr-ef"
+local_dir="/hdfsd05/dbbridge/solr-ef"
 
 
 if [ $run_from_local_disk = "1" ] ; then
-  opt_s="-s $local_dir/solr"
+  opt_s="-s $local_dir"
   export SOLR_HOME=
   echo "****"