Updated the scripts to keep logs and added more timestamps to the benchmark console output.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/e4976973 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/e4976973 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/e4976973 Branch: refs/heads/site Commit: e4976973f8fcfb613e78bbda5a7aab6e5a72899b Parents: 79ad873 Author: Preston Carman <[email protected]> Authored: Wed Jun 18 11:26:15 2014 -0700 Committer: Preston Carman <[email protected]> Committed: Wed Jun 18 11:26:15 2014 -0700 ---------------------------------------------------------------------- .../main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh | 1 + .../noaa-ghcn-daily/scripts/run_benchmark_cluster.sh | 1 + vxquery-server/src/main/resources/scripts/startcc.sh | 7 +++---- vxquery-server/src/main/resources/scripts/startnc.sh | 7 +++---- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/e4976973/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh index 7c3229c..b2b1531 100755 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh @@ -40,6 +40,7 @@ for j in $(find ${1} -name '*q??.xq') do if [ -z "${3}" ] || [[ "${j}" =~ "${3}" ]] then + date echo "Running query: ${j}" log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log" log_base_path=$(dirname ${j/queries/query_logs}) http://git-wip-us.apache.org/repos/asf/vxquery/blob/e4976973/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh index f31f9e7..f868024 100644 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh @@ -57,6 +57,7 @@ do # Only run for specified queries. if [ -z "${4}" ] || [[ "${j}" =~ "${4}" ]] then + date echo "Running query: ${j}" log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log" log_base_path=$(dirname ${j/queries/query_logs}) http://git-wip-us.apache.org/repos/asf/vxquery/blob/e4976973/vxquery-server/src/main/resources/scripts/startcc.sh ---------------------------------------------------------------------- diff --git a/vxquery-server/src/main/resources/scripts/startcc.sh b/vxquery-server/src/main/resources/scripts/startcc.sh index d7b397e..002055c 100755 --- a/vxquery-server/src/main/resources/scripts/startcc.sh +++ b/vxquery-server/src/main/resources/scripts/startcc.sh @@ -36,9 +36,8 @@ fi VXQUERY_HOME=`pwd` CCLOGS_DIR=${VXQUERY_HOME}/logs -#Remove the logs dir -rm -rf ${CCLOGS_DIR} -mkdir ${CCLOGS_DIR} +# logs dir +mkdir -p ${CCLOGS_DIR} # Set up the options for the cc. CC_OPTIONS=" -client-net-ip-address ${CCHOST} -cluster-net-ip-address ${CCHOST} " @@ -48,4 +47,4 @@ then fi #Launch hyracks cc script without toplogy -${VXQUERY_HOME}/vxquery-server/target/appassembler/bin/vxquerycc ${CC_OPTIONS} &> ${CCLOGS_DIR}/cc.log & +${VXQUERY_HOME}/vxquery-server/target/appassembler/bin/vxquerycc ${CC_OPTIONS} &> ${CCLOGS_DIR}/cc_$(date +%Y%m%d%H%M).log & http://git-wip-us.apache.org/repos/asf/vxquery/blob/e4976973/vxquery-server/src/main/resources/scripts/startnc.sh ---------------------------------------------------------------------- diff --git a/vxquery-server/src/main/resources/scripts/startnc.sh b/vxquery-server/src/main/resources/scripts/startnc.sh index 5b22be4..c2bda3c 100755 --- a/vxquery-server/src/main/resources/scripts/startnc.sh +++ b/vxquery-server/src/main/resources/scripts/startnc.sh @@ -38,9 +38,8 @@ fi VXQUERY_HOME=`pwd` NCLOGS_DIR=${VXQUERY_HOME}/logs -#Remove the logs dir -rm -rf $NCLOGS_DIR -mkdir $NCLOGS_DIR +# logs dir +mkdir -p $NCLOGS_DIR # Set up the options for the cc. NC_OPTIONS=" -cc-host ${CCHOST} -cluster-net-ip-address ${IPADDR} -data-ip-address ${IPADDR} -result-ip-address ${IPADDR} -node-id ${NODEID} " @@ -51,4 +50,4 @@ fi #Launch hyracks nc -${VXQUERY_HOME}/vxquery-server/target/appassembler/bin/vxquerync ${NC_OPTIONS} &> ${NCLOGS_DIR}/nc.log & +${VXQUERY_HOME}/vxquery-server/target/appassembler/bin/vxquerync ${NC_OPTIONS} &> ${NCLOGS_DIR}/nc_$(date +%Y%m%d%H%M).log &
