tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject git commit: TAJO-152: The tajo local directory path is mismatched in PullServer. (jihoon)
Date Fri, 06 Sep 2013 07:47:42 GMT
Updated Branches:
  refs/heads/master 14d1f87de -> e448b5efc


TAJO-152: The tajo local directory path is mismatched in PullServer. (jihoon)


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

Branch: refs/heads/master
Commit: e448b5efc91afea8dcdf96a7b144cecbe08b3fa6
Parents: 14d1f87
Author: Jihoon Son <jihoonson@apache.org>
Authored: Fri Sep 6 16:46:59 2013 +0900
Committer: Jihoon Son <jihoonson@apache.org>
Committed: Fri Sep 6 16:46:59 2013 +0900

----------------------------------------------------------------------
 CHANGES.txt                                                   | 2 ++
 .../src/test/java/org/apache/tajo/MiniTajoYarnCluster.java    | 3 +++
 .../java/org/apache/tajo/pullserver/PullServerAuxService.java | 7 ++++++-
 .../tajo-core-pullserver/src/main/resources/tajo-default.xml  | 5 -----
 4 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/e448b5ef/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 537c281..e5df10b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -126,6 +126,8 @@ Release 0.2.0 - unreleased
 
   BUG FIXES
 
+    TAJO-152: The tajo local directory path is mismatched in PullServer. (jihoon)
+
     TAJO-80: Remove codes of legacy data paths. (jihoon)
 
     TAJO-159: QueryMaster cannot connect the remote CatalogServer. (hyunsik)

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/e448b5ef/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/MiniTajoYarnCluster.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/MiniTajoYarnCluster.java
b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/MiniTajoYarnCluster.java
index 37e2721..95dc212 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/MiniTajoYarnCluster.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/MiniTajoYarnCluster.java
@@ -101,6 +101,9 @@ public class MiniTajoYarnCluster extends MiniYARNCluster {
     // Non-standard shuffle port
     conf.setInt(TajoConf.ConfVars.PULLSERVER_PORT.name(), 0);
 
+    // local directory
+    conf.set(TajoConf.ConfVars.TASK_LOCAL_DIR.name(), "/tmp/tajo-localdir");
+
     conf.setClass(YarnConfiguration.NM_CONTAINER_EXECUTOR,
         DefaultContainerExecutor.class, ContainerExecutor.class);
 

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/e448b5ef/tajo-core/tajo-core-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java
b/tajo-core/tajo-core-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java
index 924289e..93cf4e5 100644
--- a/tajo-core/tajo-core-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java
+++ b/tajo-core/tajo-core-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java
@@ -397,7 +397,12 @@ public class PullServerAuxService extends AbstractService
       LOG.info("PullServer request param: repartitionType=" + repartitionType +
           ", sid=" + sid + ", partitionId=" + partitionId + ", taskIds=" + taskIdList);
 
-      LOG.info("PullServer baseDir: " + conf.get(ConfVars.TASK_LOCAL_DIR.varname) + "/" +
queryBaseDir);
+      String taskLocalDir = conf.get(ConfVars.TASK_LOCAL_DIR.varname);
+      if (taskLocalDir == null ||
+          taskLocalDir.equals("")) {
+        LOG.error("Tajo local directory should be specified.");
+      }
+      LOG.info("PullServer baseDir: " + taskLocalDir + "/" + queryBaseDir);
 
       // if a subquery requires a range partitioning
       if (repartitionType.equals("r")) {

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/e448b5ef/tajo-core/tajo-core-pullserver/src/main/resources/tajo-default.xml
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-pullserver/src/main/resources/tajo-default.xml b/tajo-core/tajo-core-pullserver/src/main/resources/tajo-default.xml
index c003637..72f0bb9 100644
--- a/tajo-core/tajo-core-pullserver/src/main/resources/tajo-default.xml
+++ b/tajo-core/tajo-core-pullserver/src/main/resources/tajo-default.xml
@@ -30,9 +30,4 @@
     <value>file:///tmp/tajo-${user.name}</value>
     <description>A base for other temporary directories.</description>
   </property>
-
-  <property>
-    <name>tajo.task.localdir</name>
-    <value>/tmp/tajo-localdir</value>
-  </property>
 </configuration>


Mime
View raw message