tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject tajo git commit: TAJO-1200: Invalid shuffle data of multiple worker in same server. (jinho)
Date Thu, 20 Nov 2014 01:25:50 GMT
Repository: tajo
Updated Branches:
  refs/heads/master ef282ebec -> c544ffc08


TAJO-1200: Invalid shuffle data of multiple worker in same server. (jinho)

Closes #259


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/c544ffc0
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/c544ffc0
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/c544ffc0

Branch: refs/heads/master
Commit: c544ffc088d685f1ad66963351d71d7a925c7025
Parents: ef282eb
Author: jhkim <jhkim@apache.org>
Authored: Thu Nov 20 10:24:59 2014 +0900
Committer: jhkim <jhkim@apache.org>
Committed: Thu Nov 20 10:24:59 2014 +0900

----------------------------------------------------------------------
 CHANGES                                                  | 3 +++
 tajo-core/src/main/java/org/apache/tajo/worker/Task.java | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/c544ffc0/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 5e9b14f..b197457 100644
--- a/CHANGES
+++ b/CHANGES
@@ -63,6 +63,9 @@ Release 0.9.1 - unreleased
 
   BUG FIXES
 
+    TAJO-1200: Invalid shuffle data of multiple worker in same server.
+    (jinho)
+
     TAJO-1197: Unit test failed: unable to create new native thread.
     (jinho)
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/c544ffc0/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/worker/Task.java b/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
index 00edc79..cb038df 100644
--- a/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
+++ b/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
@@ -41,6 +41,7 @@ import org.apache.tajo.catalog.proto.CatalogProtos;
 import org.apache.tajo.catalog.statistics.TableStats;
 import org.apache.tajo.conf.TajoConf;
 import org.apache.tajo.engine.json.CoreGsonHelper;
+import org.apache.tajo.master.cluster.WorkerConnectionInfo;
 import org.apache.tajo.plan.util.PlannerUtil;
 import org.apache.tajo.engine.planner.physical.PhysicalExec;
 import org.apache.tajo.engine.query.QueryContext;
@@ -725,7 +726,8 @@ public class Task {
           defaultStoreFile = new File(storeDir, "in_" + i);
           InetAddress address = InetAddress.getByName(uri.getHost());
 
-          if (NetUtils.isLocalAddress(address)) {
+          WorkerConnectionInfo conn = executionBlockContext.getWorkerContext().getConnectionInfo();
+          if (NetUtils.isLocalAddress(address) && conn.getPullServerPort() == uri.getPort())
{
             boolean hasError = false;
             try {
               LOG.info("Try to get local file chunk at local host");


Mime
View raw message