You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2014/10/02 02:43:22 UTC
git commit: Fixed the test for shutting down VXQuery cluster.
Repository: vxquery
Updated Branches:
refs/heads/prestonc/exrt_benchmark_queries 1fea6e3e6 -> e1ec495f7
Fixed the test for shutting down VXQuery cluster.
- The port configuration was not handled correctly.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/e1ec495f
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/e1ec495f
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/e1ec495f
Branch: refs/heads/prestonc/exrt_benchmark_queries
Commit: e1ec495f7101d4957059e1f6c8bf0e6e2a852cfa
Parents: 1fea6e3
Author: Preston Carman <pr...@apache.org>
Authored: Wed Oct 1 17:43:09 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Wed Oct 1 17:43:09 2014 -0700
----------------------------------------------------------------------
.../mrql_scripts/run_mrql_tests.sh | 5 +++-
.../vxquery/cli/VXQueryClusterShutdown.java | 29 ++++----------------
.../src/main/resources/scripts/startcc.sh | 2 +-
.../src/main/resources/scripts/stopcluster.sh | 6 +++-
4 files changed, 16 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/e1ec495f/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh
index 831f424..918206a 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh
@@ -17,9 +17,12 @@
# limitations under the License.
#
+# Examples
+# run_mrql_tests.sh mrql_all/ 1 2
+
NODES=${2}
REPEAT=${3}
-DATASET="hcn"
+DATASET="all"
for j in $(find ${1} -name '*q??.mrql')
http://git-wip-us.apache.org/repos/asf/vxquery/blob/e1ec495f/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java b/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java
index 34c69b9..37fe4f6 100644
--- a/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java
+++ b/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java
@@ -35,8 +35,6 @@ public class VXQueryClusterShutdown {
final CmdLineOptions opts = new CmdLineOptions();
CmdLineParser parser = new CmdLineParser(opts);
- System.err.println("prep");
-
// parse command line options
try {
parser.parseArgument(args);
@@ -44,47 +42,32 @@ public class VXQueryClusterShutdown {
parser.printUsage(System.err);
return;
}
- System.err.println("read");
- System.err.println(opts.clientNetIpAddress);
- System.err.println(opts.clientNetPort);
// give error message if missing arguments
- if (opts.clientNetIpAddress == null || opts.clientNetPort == -1) {
+ if (opts.clientNetIpAddress == null) {
parser.printUsage(System.err);
return;
}
- System.err.println("ready");
-
- IHyracksClientConnection hcc;
- try {
- hcc = new HyracksConnection(opts.clientNetIpAddress, opts.clientNetPort);
- } catch (Exception e) {
- System.err.println("Unable to connect to the Hyracks cluster.");
- System.err.println(e);
- return;
- }
- System.err.println("connected");
try {
+ IHyracksClientConnection hcc = new HyracksConnection(opts.clientNetIpAddress, opts.clientNetPort);
hcc.stopCluster();
} catch (Exception e) {
- System.err.println("Unable to shutdown the Hyracks cluster.");
+ System.err.println("Unable to connect and shutdown the Hyracks cluster.");
System.err.println(e);
return;
}
-
- System.err.println("done");
}
/**
* Helper class with fields and methods to handle all command line options
*/
private static class CmdLineOptions {
- @Option(name = "-client-net-ip-address", usage = "IP Address of the ClusterController")
- private String clientNetIpAddress = null;
+ @Option(name = "-client-net-ip-address", usage = "IP Address of the ClusterController", required = true)
+ private String clientNetIpAddress;
@Option(name = "-client-net-port", usage = "Port of the ClusterController")
- private int clientNetPort = -1;
+ private int clientNetPort = 1098;
@Argument
private List<String> arguments = new ArrayList<String>();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/e1ec495f/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 26535ab..dd1e5be 100755
--- a/vxquery-server/src/main/resources/scripts/startcc.sh
+++ b/vxquery-server/src/main/resources/scripts/startcc.sh
@@ -43,7 +43,7 @@ mkdir -p ${CCLOGS_DIR}
CC_OPTIONS=" -client-net-ip-address ${CCHOST} -cluster-net-ip-address ${CCHOST} "
if [ ! -z "${CCPORT}" ]
then
- CC_OPTIONS=" ${CC_OPTIONS} -cluster-net-port ${CCPORT} "
+ CC_OPTIONS=" ${CC_OPTIONS} -client-net-port ${CCPORT} "
fi
# Launch hyracks cc script without toplogy
http://git-wip-us.apache.org/repos/asf/vxquery/blob/e1ec495f/vxquery-server/src/main/resources/scripts/stopcluster.sh
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/stopcluster.sh b/vxquery-server/src/main/resources/scripts/stopcluster.sh
index 5dbdd26..238da7f 100755
--- a/vxquery-server/src/main/resources/scripts/stopcluster.sh
+++ b/vxquery-server/src/main/resources/scripts/stopcluster.sh
@@ -38,7 +38,11 @@ CCLOGS_DIR=${VXQUERY_HOME}/logs
mkdir -p ${CCLOGS_DIR}
# Set up the options for the cc.
-CC_OPTIONS=" -client-net-ip-address ${CCHOST} -client-net-port ${CCPORT} "
+CC_OPTIONS=" -client-net-ip-address ${CCHOST} "
+if [ ! -z "${CCPORT}" ]
+then
+ CC_OPTIONS=" ${CC_OPTIONS} -client-net-port ${CCPORT} "
+fi
# Launch hyracks cc script without toplogy
echo "${VXQUERY_HOME}/vxquery-server/target/appassembler/bin/vxqueryshutdown ${CC_OPTIONS} &> ${CCLOGS_DIR}/shutdown_$(date +%Y%m%d%H%M).log &"