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 2014/03/05 16:09:51 UTC
git commit: TAJO-648: TajoWorker does not send correct QM rpc and
client rpc ports via heartbeat.
Repository: incubator-tajo
Updated Branches:
refs/heads/master 39bd61aea -> ed4ba76f4
TAJO-648: TajoWorker does not send correct QM rpc and client rpc ports via heartbeat.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/ed4ba76f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/ed4ba76f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/ed4ba76f
Branch: refs/heads/master
Commit: ed4ba76f4fa9eba251d59684ace8c488819d9a0d
Parents: 39bd61a
Author: Hyunsik Choi <hy...@apache.org>
Authored: Thu Mar 6 00:09:42 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Thu Mar 6 00:09:42 2014 +0900
----------------------------------------------------------------------
CHANGES.txt | 3 ++
.../java/org/apache/tajo/worker/TajoWorker.java | 35 +++++++++-----------
2 files changed, 18 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ed4ba76f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4955163..c17c00d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -269,6 +269,9 @@ Release 0.8.0 - unreleased
BUG FIXES
+ TAJO-648: TajoWorker does not send correct QM rpc and client rpc ports
+ via heartbeat. (hyunsik)
+
TAJO-653: RCFileAppender throws IOException. (jinho)
TAJO-641: NPE in HCatalogStore.addTable(). (jaehwa)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ed4ba76f/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorker.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorker.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorker.java
index 395758f..0b8d6c2 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorker.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorker.java
@@ -188,29 +188,19 @@ public class TajoWorker extends CompositeService {
systemConf.setIntVar(ConfVars.PULLSERVER_PORT, 0);
}
- if(queryMasterMode) {
- //querymaster worker
- tajoWorkerClientService = new TajoWorkerClientService(workerContext, clientPort);
- addService(tajoWorkerClientService);
+ // querymaster worker
+ tajoWorkerClientService = new TajoWorkerClientService(workerContext, clientPort);
+ addService(tajoWorkerClientService);
- queryMasterManagerService = new QueryMasterManagerService(workerContext, qmManagerPort);
- addService(queryMasterManagerService);
- }
+ queryMasterManagerService = new QueryMasterManagerService(workerContext, qmManagerPort);
+ addService(queryMasterManagerService);
- if(taskRunnerMode) {
- //taskrunner worker
- taskRunnerManager = new TaskRunnerManager(workerContext);
- addService(taskRunnerManager);
+ // taskrunner worker
+ taskRunnerManager = new TaskRunnerManager(workerContext);
+ addService(taskRunnerManager);
- if(!yarnContainerMode) {
- tajoWorkerManagerService = new TajoWorkerManagerService(workerContext, peerRpcPort);
- addService(tajoWorkerManagerService);
- }
- }
-
- LOG.info("Tajo Worker started: queryMaster=" + queryMasterMode + " taskRunner=" + taskRunnerMode +
- ",yarnContainer=" + yarnContainerMode + ", clientPort=" + clientPort +
- ", peerRpcPort=" + peerRpcPort + ":" + qmManagerPort);
+ tajoWorkerManagerService = new TajoWorkerManagerService(workerContext, peerRpcPort);
+ addService(tajoWorkerManagerService);
if(!yarnContainerMode) {
if(taskRunnerMode) {
@@ -241,6 +231,11 @@ public class TajoWorker extends CompositeService {
}
}
+ LOG.info("Tajo Worker started: queryMaster=" + queryMasterMode + " taskRunner=" + taskRunnerMode +
+ ", qmRpcPort=" + qmManagerPort +
+ ",yarnContainer=" + yarnContainerMode + ", clientPort=" + clientPort +
+ ", peerRpcPort=" + peerRpcPort + ":" + qmManagerPort + ",httpPort" + httpPort);
+
super.init(conf);
if(yarnContainerMode && queryMasterMode) {