Eliminate the use of 'echo -n' in EC2 scripts Review: https://reviews.apache.org/r/32903
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fe09d7de Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fe09d7de Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fe09d7de Branch: refs/heads/master Commit: fe09d7de7f84de82f447d4321fe89912c06e402c Parents: fbfe3fa Author: Paul Brett <[email protected]> Authored: Tue Apr 7 10:28:07 2015 -0700 Committer: Ian Downes <[email protected]> Committed: Tue Apr 7 10:28:07 2015 -0700 ---------------------------------------------------------------------- ec2/deploy.amazon64-old/root/mesos-ec2/hypertable/Capfile | 2 +- ec2/deploy.amazon64-old/root/mesos-ec2/setup | 10 +++++----- ec2/deploy.amazon64/root/mesos-ec2/hypertable/Capfile | 2 +- ec2/deploy.amazon64/root/mesos-ec2/setup | 10 +++++----- ec2/deploy.centos64/root/mesos-ec2/hypertable/Capfile | 2 +- ec2/deploy.centos64/root/mesos-ec2/setup | 10 +++++----- ec2/deploy.lucid64/root/mesos-ec2/setup | 10 +++++----- 7 files changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/fe09d7de/ec2/deploy.amazon64-old/root/mesos-ec2/hypertable/Capfile ---------------------------------------------------------------------- diff --git a/ec2/deploy.amazon64-old/root/mesos-ec2/hypertable/Capfile b/ec2/deploy.amazon64-old/root/mesos-ec2/hypertable/Capfile index 8b50912..fd5921e 100644 --- a/ec2/deploy.amazon64-old/root/mesos-ec2/hypertable/Capfile +++ b/ec2/deploy.amazon64-old/root/mesos-ec2/hypertable/Capfile @@ -416,7 +416,7 @@ if "#{test_driver}" == "hypertable" set :run_test_dispatcher_command, "#{install_dir}/current/bin/jrun --pidfile #{install_dir}/#{hypertable_version}/run/Hypertable.TestDispatcher.pid org.hypertable.examples.PerformanceTest.Dispatcher --driver=#{test_driver} --clients=#{roles[:test_client].servers.length*client_multiplier} #{test_args}" set :stop_test_args, "" elsif "#{test_driver}" == "hbase" - set :thrift_broker_command, "echo -n" + set :thrift_broker_command, "true" set :start_test_client_command, "#{install_dir}/current/bin/start-test-client.sh --jrun-opts \"--add-to-classpath #{hbase_home}/conf\" --count #{client_multiplier} #{roles[:test_dispatcher].servers[0]}" set :run_test_dispatcher_command, "#{install_dir}/current/bin/jrun --pidfile #{install_dir}/#{hypertable_version}/run/Hypertable.TestDispatcher.pid --add-to-classpath #{hbase_home}/conf org.hypertable.examples.PerformanceTest.Dispatcher --driver=#{test_driver} --clients=#{roles[:test_client].servers.length*client_multiplier} #{test_args}" set :stop_test_args, "--no-thriftbroker --no-dfsbroker" http://git-wip-us.apache.org/repos/asf/mesos/blob/fe09d7de/ec2/deploy.amazon64-old/root/mesos-ec2/setup ---------------------------------------------------------------------- diff --git a/ec2/deploy.amazon64-old/root/mesos-ec2/setup b/ec2/deploy.amazon64-old/root/mesos-ec2/setup index 8d4f4b0..2165f90 100755 --- a/ec2/deploy.amazon64-old/root/mesos-ec2/setup +++ b/ec2/deploy.amazon64-old/root/mesos-ec2/setup @@ -67,11 +67,11 @@ echo "Running setup-slave on master to mount filesystems, etc..." echo "SSH'ing to master machine(s) to approve key(s)..." for master in $MASTERS; do echo $master - ssh $SSH_OPTS $master echo -n & + ssh $SSH_OPTS $master true & sleep 0.3 done -ssh $SSH_OPTS localhost echo -n & -ssh $SSH_OPTS `hostname` echo -n & +ssh $SSH_OPTS localhost true & +ssh $SSH_OPTS `hostname` true & wait if [[ $NUM_ZOOS != 0 ]] ; then @@ -79,7 +79,7 @@ if [[ $NUM_ZOOS != 0 ]] ; then zid=1 for zoo in $ZOO; do echo $zoo - ssh $SSH_OPTS $zoo echo -n \; mkdir -p /tmp/zookeeper \; echo $zid \> /tmp/zookeeper/myid & + ssh $SSH_OPTS $zoo true \; mkdir -p /tmp/zookeeper \; echo $zid \> /tmp/zookeeper/myid & zid=$(($zid+1)) sleep 0.3 done @@ -94,7 +94,7 @@ while [ "e$TODO" != "e" ] && [ $TRIES -lt 4 ] ; do NEW_TODO= for slave in $TODO; do echo $slave - ssh $SSH_OPTS $slave echo -n + ssh $SSH_OPTS $slave true if [ $? != 0 ] ; then NEW_TODO="$NEW_TODO $slave" fi http://git-wip-us.apache.org/repos/asf/mesos/blob/fe09d7de/ec2/deploy.amazon64/root/mesos-ec2/hypertable/Capfile ---------------------------------------------------------------------- diff --git a/ec2/deploy.amazon64/root/mesos-ec2/hypertable/Capfile b/ec2/deploy.amazon64/root/mesos-ec2/hypertable/Capfile index 8b50912..fd5921e 100644 --- a/ec2/deploy.amazon64/root/mesos-ec2/hypertable/Capfile +++ b/ec2/deploy.amazon64/root/mesos-ec2/hypertable/Capfile @@ -416,7 +416,7 @@ if "#{test_driver}" == "hypertable" set :run_test_dispatcher_command, "#{install_dir}/current/bin/jrun --pidfile #{install_dir}/#{hypertable_version}/run/Hypertable.TestDispatcher.pid org.hypertable.examples.PerformanceTest.Dispatcher --driver=#{test_driver} --clients=#{roles[:test_client].servers.length*client_multiplier} #{test_args}" set :stop_test_args, "" elsif "#{test_driver}" == "hbase" - set :thrift_broker_command, "echo -n" + set :thrift_broker_command, "true" set :start_test_client_command, "#{install_dir}/current/bin/start-test-client.sh --jrun-opts \"--add-to-classpath #{hbase_home}/conf\" --count #{client_multiplier} #{roles[:test_dispatcher].servers[0]}" set :run_test_dispatcher_command, "#{install_dir}/current/bin/jrun --pidfile #{install_dir}/#{hypertable_version}/run/Hypertable.TestDispatcher.pid --add-to-classpath #{hbase_home}/conf org.hypertable.examples.PerformanceTest.Dispatcher --driver=#{test_driver} --clients=#{roles[:test_client].servers.length*client_multiplier} #{test_args}" set :stop_test_args, "--no-thriftbroker --no-dfsbroker" http://git-wip-us.apache.org/repos/asf/mesos/blob/fe09d7de/ec2/deploy.amazon64/root/mesos-ec2/setup ---------------------------------------------------------------------- diff --git a/ec2/deploy.amazon64/root/mesos-ec2/setup b/ec2/deploy.amazon64/root/mesos-ec2/setup index b6b7360..c69f7da 100755 --- a/ec2/deploy.amazon64/root/mesos-ec2/setup +++ b/ec2/deploy.amazon64/root/mesos-ec2/setup @@ -67,11 +67,11 @@ echo "Running setup-slave on master to mount filesystems, etc..." echo "SSH'ing to master machine(s) to approve key(s)..." for master in $MASTERS; do echo $master - ssh $SSH_OPTS $master echo -n & + ssh $SSH_OPTS $master true & sleep 0.3 done -ssh $SSH_OPTS localhost echo -n & -ssh $SSH_OPTS `hostname` echo -n & +ssh $SSH_OPTS localhost true & +ssh $SSH_OPTS `hostname` true & wait if [[ $NUM_ZOOS != 0 ]] ; then @@ -79,7 +79,7 @@ if [[ $NUM_ZOOS != 0 ]] ; then zid=1 for zoo in $ZOO; do echo $zoo - ssh $SSH_OPTS $zoo echo -n \; mkdir -p /tmp/zookeeper \; echo $zid \> /tmp/zookeeper/myid & + ssh $SSH_OPTS $zoo true \; mkdir -p /tmp/zookeeper \; echo $zid \> /tmp/zookeeper/myid & zid=$(($zid+1)) sleep 0.3 done @@ -94,7 +94,7 @@ while [ "e$TODO" != "e" ] && [ $TRIES -lt 4 ] ; do NEW_TODO= for slave in $TODO; do echo $slave - ssh $SSH_OPTS $slave echo -n + ssh $SSH_OPTS $slave true if [ $? != 0 ] ; then NEW_TODO="$NEW_TODO $slave" fi http://git-wip-us.apache.org/repos/asf/mesos/blob/fe09d7de/ec2/deploy.centos64/root/mesos-ec2/hypertable/Capfile ---------------------------------------------------------------------- diff --git a/ec2/deploy.centos64/root/mesos-ec2/hypertable/Capfile b/ec2/deploy.centos64/root/mesos-ec2/hypertable/Capfile index f85584a..e309971 100644 --- a/ec2/deploy.centos64/root/mesos-ec2/hypertable/Capfile +++ b/ec2/deploy.centos64/root/mesos-ec2/hypertable/Capfile @@ -379,7 +379,7 @@ if "#{test_driver}" == "hypertable" set :run_test_dispatcher_command, "#{install_dir}/current/bin/jrun --pidfile #{install_dir}/#{hypertable_version}/run/Hypertable.TestDispatcher.pid org.hypertable.examples.PerformanceTest.Dispatcher --driver=#{test_driver} --clients=#{roles[:test_client].servers.length*client_multiplier} #{test_args}" set :stop_test_args, "" elsif "#{test_driver}" == "hbase" - set :thrift_broker_command, "echo -n" + set :thrift_broker_command, "true" set :start_test_client_command, "#{install_dir}/current/bin/start-test-client.sh --jrun-opts \"--add-to-classpath #{hbase_home}/conf\" --count #{client_multiplier} #{roles[:test_dispatcher].servers[0]}" set :run_test_dispatcher_command, "#{install_dir}/current/bin/jrun --pidfile #{install_dir}/#{hypertable_version}/run/Hypertable.TestDispatcher.pid --add-to-classpath #{hbase_home}/conf org.hypertable.examples.PerformanceTest.Dispatcher --driver=#{test_driver} --clients=#{roles[:test_client].servers.length*client_multiplier} #{test_args}" set :stop_test_args, "--no-thriftbroker --no-dfsbroker" http://git-wip-us.apache.org/repos/asf/mesos/blob/fe09d7de/ec2/deploy.centos64/root/mesos-ec2/setup ---------------------------------------------------------------------- diff --git a/ec2/deploy.centos64/root/mesos-ec2/setup b/ec2/deploy.centos64/root/mesos-ec2/setup index f380f7a..f06ed21 100755 --- a/ec2/deploy.centos64/root/mesos-ec2/setup +++ b/ec2/deploy.centos64/root/mesos-ec2/setup @@ -67,11 +67,11 @@ echo "Running setup-slave on master to mount filesystems, etc..." echo "SSH'ing to master machine(s) to approve key(s)..." for master in $MASTERS; do echo $master - ssh $SSH_OPTS $master echo -n & + ssh $SSH_OPTS $master true & sleep 0.3 done -ssh $SSH_OPTS localhost echo -n & -ssh $SSH_OPTS `hostname` echo -n & +ssh $SSH_OPTS localhost true & +ssh $SSH_OPTS `hostname` true & wait if [[ $NUM_ZOOS != 0 ]] ; then @@ -79,7 +79,7 @@ if [[ $NUM_ZOOS != 0 ]] ; then zid=1 for zoo in $ZOO; do echo $zoo - ssh $SSH_OPTS $zoo echo -n \; mkdir -p /tmp/zookeeper \; echo $zid \> /tmp/zookeeper/myid & + ssh $SSH_OPTS $zoo true \; mkdir -p /tmp/zookeeper \; echo $zid \> /tmp/zookeeper/myid & zid=$(($zid+1)) sleep 0.3 done @@ -94,7 +94,7 @@ while [ "e$TODO" != "e" ] && [ $TRIES -lt 4 ] ; do NEW_TODO= for slave in $TODO; do echo $slave - ssh $SSH_OPTS $slave echo -n + ssh $SSH_OPTS $slave true if [ $? != 0 ] ; then NEW_TODO="$NEW_TODO $slave" fi http://git-wip-us.apache.org/repos/asf/mesos/blob/fe09d7de/ec2/deploy.lucid64/root/mesos-ec2/setup ---------------------------------------------------------------------- diff --git a/ec2/deploy.lucid64/root/mesos-ec2/setup b/ec2/deploy.lucid64/root/mesos-ec2/setup index 0a74757..cd11d65 100755 --- a/ec2/deploy.lucid64/root/mesos-ec2/setup +++ b/ec2/deploy.lucid64/root/mesos-ec2/setup @@ -63,11 +63,11 @@ echo "Running setup-slave on master to mount filesystems, etc..." echo "SSH'ing to master machine(s) to approve key(s)..." for master in $MASTERS; do echo $master - ssh $SSH_OPTS $master echo -n & + ssh $SSH_OPTS $master true & sleep 0.3 done -ssh $SSH_OPTS localhost echo -n & -ssh $SSH_OPTS `hostname` echo -n & +ssh $SSH_OPTS localhost true & +ssh $SSH_OPTS `hostname` true & wait if [[ $NUM_ZOOS != 0 ]] ; then @@ -75,7 +75,7 @@ if [[ $NUM_ZOOS != 0 ]] ; then zid=1 for zoo in $ZOO; do echo $zoo - ssh $SSH_OPTS $zoo echo -n \; mkdir -p /tmp/zookeeper \; echo $zid \> /tmp/zookeeper/myid & + ssh $SSH_OPTS $zoo true \; mkdir -p /tmp/zookeeper \; echo $zid \> /tmp/zookeeper/myid & zid=$(($zid+1)) sleep 0.3 done @@ -90,7 +90,7 @@ while [ "e$TODO" != "e" ] && [ $TRIES -lt 4 ] ; do NEW_TODO= for slave in $TODO; do echo $slave - ssh $SSH_OPTS $slave echo -n + ssh $SSH_OPTS $slave true if [ $? != 0 ] ; then NEW_TODO="$NEW_TODO $slave" fi
