Repository: tajo Updated Branches: refs/heads/branch-0.10.1 63c2fb6c5 -> 2af644774
TAJO-1605: Fix master build failure on jdk 1.6. (jinho) Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/2af64477 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/2af64477 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/2af64477 Branch: refs/heads/branch-0.10.1 Commit: 2af644774e7f6c2d3b85339df8c871d95996e5c6 Parents: 63c2fb6 Author: Jinho Kim <[email protected]> Authored: Fri May 15 11:49:55 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Fri May 15 11:49:55 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../java/org/apache/tajo/service/HAServiceTracker.java | 11 ++++++++--- .../org/apache/tajo/worker/WorkerHeartbeatService.java | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/2af64477/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 39e2dfe..355bf30 100644 --- a/CHANGES +++ b/CHANGES @@ -39,6 +39,8 @@ Release 0.10.1 - unreleased BUG FIXES + TAJO-1605: Fix master build failure on jdk 1.6. (jinho) + TAJO-1586: TajoMaster HA startup failure on Yarn. (jaehwa) TAJO-1485: Datum 'Char' returned only 1byte. http://git-wip-us.apache.org/repos/asf/tajo/blob/2af64477/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java b/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java index 081b153..8c553e9 100644 --- a/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java +++ b/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java @@ -21,10 +21,9 @@ package org.apache.tajo.service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.net.NetUtils; -import org.apache.tajo.conf.TajoConf; -import org.apache.tajo.util.FileUtil; import javax.net.SocketFactory; +import java.io.IOException; import java.net.InetSocketAddress; import java.net.Socket; @@ -59,7 +58,13 @@ public abstract class HAServiceTracker implements ServiceTracker { } catch (Exception e) { isAlive = false; } finally { - FileUtil.cleanup(LOG, socket); + if (socket != null) { + try { + socket.close(); + } catch (IOException e) { + LOG.debug(e.getMessage(), e); + } + } } return isAlive; } http://git-wip-us.apache.org/repos/asf/tajo/blob/2af64477/tajo-core/src/main/java/org/apache/tajo/worker/WorkerHeartbeatService.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/worker/WorkerHeartbeatService.java b/tajo-core/src/main/java/org/apache/tajo/worker/WorkerHeartbeatService.java index ad67f94..bb52350 100644 --- a/tajo-core/src/main/java/org/apache/tajo/worker/WorkerHeartbeatService.java +++ b/tajo-core/src/main/java/org/apache/tajo/worker/WorkerHeartbeatService.java @@ -76,12 +76,12 @@ public class WorkerHeartbeatService extends AbstractService { this.systemConf = (TajoConf) conf; this.connectionManager = RpcClientManager.getInstance(); + thread = new WorkerHeartbeatThread(); super.serviceInit(conf); } @Override public void serviceStart() throws Exception { - thread = new WorkerHeartbeatThread(); thread.start(); super.serviceStart(); }
