Changeset 31367


Ignore:
Timestamp:
2017-01-29T23:39:41+13:00 (4 years ago)
Author:
davidb
Message:

Changes to work with solr1 and solr2

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

Legend:

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

    r31078 r31367  
    11#!/bin/bash
    22
    3 ssh gchead zkServer.sh start
     3zookeeper_host=${ZOOKEEPER_SERVER%:*}
     4
     5ssh $zookeeper_host zkServer.sh start
  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SCRIPTS/remote-zookeeper-stop.sh

    r31078 r31367  
    11#!/bin/bash
    22
    3 ssh gchead zkServer.sh stop
     3zookeeper_host=${ZOOKEEPER_SERVER%:*}
     4
     5ssh $zookeeper_host zkServer.sh stop
  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/gslis-cluster/SETUP.bash

    r31305 r31367  
    1111  export ZOOKEEPER_SERVER=localhost:8181
    1212  export SOLR_NODES="localhost:8983 localhost:8984 localhost:8985 localhost:8986 localhost:8987 localhost:8988 localhost:8989 localhost:8990 localhost:8991 localhost:8992"
    13 else
     13 
     14elif [ "${short_hostname%[1-2]}" = "solr" ] ; then
     15  export ZOOKEEPER_SERVER=solr1:8181
     16  export SOLR_NODES="solr1:8983 solr1:8984 solr1:8985 solr1:8986 solr1:8987"
     17  export SOLR_NODES="$SOLR_NODES solr2:8983 solr2:8984 solr2:8985 solr2:8986 solr:8987"
     18
     19else
    1420  export ZOOKEEPER_SERVER=gchead:8181
    1521  export SOLR_NODES="gc0:8983 gc1:8983 gc2:8983 gc3:8983 gc4:8983 gc5:8983 gc6:8983 gc7:8983 gc8:8983 gc9:8983"
     
    1723fi
    1824
    19 if [ "$short_hostname" != "nema" ] ; then
     25if [ "$short_hostname" != "nema" ] && [ "${short_hostname%[1-2]}" != "solr" ] ; then
    2026  HDFS_HEAD=hdfs://gchead:9000
    2127fi
     
    3440fi
    3541
    36 export JAVA_HOME="$HTRC_EF_NETWORK_HOME/jdk1.8.0"
     42if [ "${short_hostname%[1-2]}" = "solr" ] ; then
     43  export JAVA_HOME="/usr/lib/jvm/j2sdk1.8-oracle"
     44else
     45  export JAVA_HOME="$HTRC_EF_NETWORK_HOME/jdk1.8.0"
     46fi
     47
    3748export PATH="$JAVA_HOME/bin:$PATH"
    3849#export _JAVA_OPTIONS="-Xmx512m"
     
    4657fi
    4758
    48 if [ "$short_hostname" != "nema" ] ; then
     59if [ "$short_hostname" != "nema" ] && [ "${short_hostname%[1-2]}" != "solr" ] ; then
    4960  source SETUP/setup-spark.bash
    5061fi
     
    5364source SETUP/setup-solr.bash
    5465
    55 export MONGODB_CONFIG_HOSTS="gc0 gc1 gc2"
    56 export MONGODB_CONFIG_PORT="27019"
     66if [ "$short_hostname" = "gsliscluster1" ] ; then
     67  export MONGODB_CONFIG_HOSTS="gc0 gc1 gc2"
     68  export MONGODB_CONFIG_PORT="27019"
    5769
    58 export MONGODB_ROUTER_HOSTS="gc3 gc4 gc5"
    59 export MONGODB_ROUTER_PORT="27017"
     70  export MONGODB_ROUTER_HOSTS="gc3 gc4 gc5"
     71  export MONGODB_ROUTER_PORT="27017"
    6072
    61 export MONGODB_REPLSET1_HOSTS="gc6 gc7"
    62 export MONGODB_REPLSET2_HOSTS="gc8 gc9"
    63 export MONGODB_REPLSET_PORT="27017"
    64 ##export MONGODB_REPLSET_ARRAY=("$MONGODB_REPLSET1_HOSTS" "$MONGODB_REPLSET2_HOSTS")
    65 export MONGODB_REPLSET_METALIST="MONGODB_REPLSET1_HOSTS MONGODB_REPLSET2_HOSTS"
    66 export MONGODB_SHARD_HOSTS="$MONGODB_REPLSET1_HOSTS $MONGODB_REPLSET2_HOSTS"
     73  export MONGODB_REPLSET1_HOSTS="gc6 gc7"
     74  export MONGODB_REPLSET2_HOSTS="gc8 gc9"
     75  export MONGODB_REPLSET_PORT="27017"
     76  ##export MONGODB_REPLSET_ARRAY=("$MONGODB_REPLSET1_HOSTS" "$MONGODB_REPLSET2_HOSTS")
     77  export MONGODB_REPLSET_METALIST="MONGODB_REPLSET1_HOSTS MONGODB_REPLSET2_HOSTS"
     78  export MONGODB_SHARD_HOSTS="$MONGODB_REPLSET1_HOSTS $MONGODB_REPLSET2_HOSTS"
    6779
    68 source SETUP/setup-mongodb.bash
     80  source SETUP/setup-mongodb.bash
     81fi
    6982
    7083export PATH="$HTRC_EF_NETWORK_HOME/SCRIPTS:$PATH"
     
    7386fi
    7487
    75 if [ "$short_hostname" != "nema" ] ; then
     88if [ "$short_hostname" != "nema" ] && [ "${short_hostname%[1-2]}" != "solr" ] ; then   
    7689  spark_conf_slaves="$SPARK_HOME/conf/slaves"
    7790  if [ ! -f "$spark_conf_slaves" ] ; then
Note: See TracChangeset for help on using the changeset viewer.