You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2013/10/30 05:23:26 UTC
git commit: TAJO-293: querymasters directory not found in single node
setup. (hyunsik)
Updated Branches:
refs/heads/master 3c22d3eba -> 99959420a
TAJO-293: querymasters directory not found in single node setup. (hyunsik)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/99959420
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/99959420
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/99959420
Branch: refs/heads/master
Commit: 99959420a2362cc7c42a9c8ed7ea294541793bec
Parents: 3c22d3e
Author: Hyunsik Choi <hy...@apache.org>
Authored: Wed Oct 30 13:09:29 2013 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Wed Oct 30 13:09:29 2013 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 ++
tajo-dist/src/main/bin/start-tajo.sh | 4 +++-
tajo-dist/src/main/bin/stop-tajo.sh | 4 +++-
3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/99959420/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9f14a4b..b7f131e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -228,6 +228,8 @@ Release 0.2.0 - unreleased
BUG FIXES
+ TAJO-293: querymasters directory not found in single node setup. (hyunsik)
+
TAJO-281: 'mvn package -Pdist' generates duplicate Tajo jar files.
(hyunsik)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/99959420/tajo-dist/src/main/bin/start-tajo.sh
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/bin/start-tajo.sh b/tajo-dist/src/main/bin/start-tajo.sh
index cadf9a8..3e11c39 100755
--- a/tajo-dist/src/main/bin/start-tajo.sh
+++ b/tajo-dist/src/main/bin/start-tajo.sh
@@ -33,5 +33,7 @@ fi
if [ "$TAJO_WORKER_STANDBY_MODE" = "true" ]; then
"$bin/tajo-daemons.sh" cd "$TAJO_HOME" \; "$bin/tajo-daemon.sh" start worker
- "$bin/tajo-daemons.sh" --hosts querymasters cd "$TAJO_HOME" \; "$bin/tajo-daemon.sh" start querymaster
+ if [ -f "${TAJO_CONF_DIR}/querymasters" ]; then
+ "$bin/tajo-daemons.sh" --hosts querymasters cd "$TAJO_HOME" \; "$bin/tajo-daemon.sh" start querymaster
+ fi
fi
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/99959420/tajo-dist/src/main/bin/stop-tajo.sh
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/bin/stop-tajo.sh b/tajo-dist/src/main/bin/stop-tajo.sh
index 2ad7113..cbabadb 100755
--- a/tajo-dist/src/main/bin/stop-tajo.sh
+++ b/tajo-dist/src/main/bin/stop-tajo.sh
@@ -32,6 +32,8 @@ fi
if [ "$TAJO_WORKER_STANDBY_MODE" = "true" ]; then
"$bin/tajo-daemons.sh" cd "$TAJO_HOME" \; "$bin/tajo-daemon.sh" stop worker
- "$bin/tajo-daemons.sh" --hosts querymasters cd "$TAJO_HOME" \; "$bin/tajo-daemon.sh" stop querymaster
+ if [ -f "${TAJO_CONF_DIR}/querymasters" ]; then
+ "$bin/tajo-daemons.sh" --hosts querymasters cd "$TAJO_HOME" \; "$bin/tajo-daemon.sh" stop querymaster
+ fi
fi