Fixes to scripts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/df42c815 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/df42c815 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/df42c815 Branch: refs/heads/0.2-dev Commit: df42c8152fc13e1a0c828a6c53a7e91049ebbc75 Parents: fb233db Author: Aaron McCurry <[email protected]> Authored: Thu Jan 10 12:57:03 2013 -0500 Committer: Aaron McCurry <[email protected]> Committed: Thu Jan 10 12:57:03 2013 -0500 ---------------------------------------------------------------------- src/distribution/src/main/scripts/bin/servers.sh | 12 +++++----- src/distribution/src/main/scripts/bin/start-all.sh | 2 +- .../src/main/scripts/bin/start-server.sh | 2 +- src/distribution/src/main/scripts/bin/stop-all.sh | 2 +- src/distribution/src/main/scripts/conf/blur-env.sh | 17 +++----------- src/distribution/src/main/scripts/conf/servers | 1 + 6 files changed, 14 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/df42c815/src/distribution/src/main/scripts/bin/servers.sh ---------------------------------------------------------------------- diff --git a/src/distribution/src/main/scripts/bin/servers.sh b/src/distribution/src/main/scripts/bin/servers.sh index 6b22678..87aa447 100755 --- a/src/distribution/src/main/scripts/bin/servers.sh +++ b/src/distribution/src/main/scripts/bin/servers.sh @@ -20,13 +20,13 @@ bin=`cd "$bin"; pwd` . "$bin"/blur-config.sh -export HOSTLIST="${BLUR_HOME_CONF}/shards" +export HOSTLIST="${BLUR_HOME_CONF}/servers" -for shard in `cat "$HOSTLIST"|sed "s/#.*$//;/^$/d"`; do - ssh $BLUR_SSH_OPTS $shard $"${@// /\\ }" \ - 2>&1 | sed "s/^/$shard: /" & - if [ "$BLUR_SHARD_SLEEP" != "" ]; then - sleep $BLUR_SHARD_SLEEP +for server in `cat "$HOSTLIST"|sed "s/#.*$//;/^$/d"`; do + ssh $BLUR_SSH_OPTS $server $"${@// /\\ }" \ + 2>&1 | sed "s/^/$server: /" & + if [ "$BLUR_SLEEP" != "" ]; then + sleep $BLUR_SLEEP fi done http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/df42c815/src/distribution/src/main/scripts/bin/start-all.sh ---------------------------------------------------------------------- diff --git a/src/distribution/src/main/scripts/bin/start-all.sh b/src/distribution/src/main/scripts/bin/start-all.sh index 639ab98..26764e0 100755 --- a/src/distribution/src/main/scripts/bin/start-all.sh +++ b/src/distribution/src/main/scripts/bin/start-all.sh @@ -20,6 +20,6 @@ bin=`cd "$bin"; pwd` . "$bin"/blur-config.sh -$BLUR_HOME/bin/shards.sh $BLUR_HOME/bin/start-shard-server.sh +$BLUR_HOME/bin/servers.sh $BLUR_HOME/bin/start-server.sh http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/df42c815/src/distribution/src/main/scripts/bin/start-server.sh ---------------------------------------------------------------------- diff --git a/src/distribution/src/main/scripts/bin/start-server.sh b/src/distribution/src/main/scripts/bin/start-server.sh index d53fcbc..d213c27 100755 --- a/src/distribution/src/main/scripts/bin/start-server.sh +++ b/src/distribution/src/main/scripts/bin/start-server.sh @@ -21,7 +21,7 @@ bin=`cd "$bin"; pwd` . "$bin"/blur-config.sh INSTANCE=0 -while [ $INSTANCE -lt $BLUR_NUMBER_OF_SERVER_INSTANCES_PER_MACHINE ]; do +while [ $INSTANCE -lt $BLUR_NUMBER_OF_SERVER_INSTANCES_PER_MACHINE ]; do PID_FILE=$BLUR_HOME/pids/blur-$INSTANCE.pid if [ -f $PID_FILE ]; then http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/df42c815/src/distribution/src/main/scripts/bin/stop-all.sh ---------------------------------------------------------------------- diff --git a/src/distribution/src/main/scripts/bin/stop-all.sh b/src/distribution/src/main/scripts/bin/stop-all.sh index 5e1342d..e2f98ec 100755 --- a/src/distribution/src/main/scripts/bin/stop-all.sh +++ b/src/distribution/src/main/scripts/bin/stop-all.sh @@ -20,5 +20,5 @@ bin=`cd "$bin"; pwd` . "$bin"/blur-config.sh -$BLUR_HOME/bin/shards.sh $BLUR_HOME/bin/stop-shard-server.sh +$BLUR_HOME/bin/servers.sh $BLUR_HOME/bin/stop-server.sh http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/df42c815/src/distribution/src/main/scripts/conf/blur-env.sh ---------------------------------------------------------------------- diff --git a/src/distribution/src/main/scripts/conf/blur-env.sh b/src/distribution/src/main/scripts/conf/blur-env.sh index 9c4f20b..41b7a06 100755 --- a/src/distribution/src/main/scripts/conf/blur-env.sh +++ b/src/distribution/src/main/scripts/conf/blur-env.sh @@ -28,10 +28,7 @@ #-XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:CMSIncrementalDutyCycleMin=10 -XX:CMSIncrementalDutyCycle=50 \ #-XX:ParallelGCThreads=8 -XX:+UseParNewGC -XX:MaxGCPauseMillis=200 -XX:GCTimeRatio=10 -XX:+DisableExplicitGC \ #-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$BLUR_HOME/logs/gc-blur-shard-server_`date +%Y%m%d_%H%M%S`.log -export BLUR_SHARD_JVM_OPTIONS="-Xmx1024m" - -# JAVA JVM OPTIONS for the shard servers, jvm tuning parameters are placed here. -export BLUR_CONTROLLER_JVM_OPTIONS="-Xmx1024m" +export BLUR_JVM_OPTIONS="-Xmx1024m -XX:MaxDirectMemorySize=256m" # JAVA JVM OPTIONS for the shard servers, jvm tuning parameters are placed here. export BLUR_COMMAND="-Xmx1024m" @@ -40,16 +37,10 @@ export BLUR_COMMAND="-Xmx1024m" export BLUR_SSH_OPTS= # Time to sleep between shard server commands. -export BLUR_SHARD_SLEEP=0.1 - -# Time to sleep between controller server commands. -export BLUR_CONTROLLER_SLEEP=0.1 - -# The of shard servers to spawn per machine. -export BLUR_NUMBER_OF_SHARD_SERVER_INSTANCES_PER_MACHINE=1 +export BLUR_SLEEP=0.1 -# The of controller servers to spawn per machine. -export BLUR_NUMBER_OF_CONTROLLER_SERVER_INSTANCES_PER_MACHINE=1 +# The of servers to spawn per machine. +export BLUR_NUMBER_OF_SERVER_INSTANCES_PER_MACHINE=1 # The directory where all the log files will be located. # export BLUR_LOGS=$BLUR_HOME/logs http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/df42c815/src/distribution/src/main/scripts/conf/servers ---------------------------------------------------------------------- diff --git a/src/distribution/src/main/scripts/conf/servers b/src/distribution/src/main/scripts/conf/servers new file mode 100644 index 0000000..2fbb50c --- /dev/null +++ b/src/distribution/src/main/scripts/conf/servers @@ -0,0 +1 @@ +localhost
