drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prog...@apache.org
Subject drill git commit: DRILL-5740: Ensure spill directories are unique
Date Wed, 30 Aug 2017 00:04:08 GMT
Repository: drill
Updated Branches:
  refs/heads/master a51c98b8b -> d1a6134b4


DRILL-5740: Ensure spill directories are unique

A recent change added the node name and port to make the spill path
unique. Turns out we need to add this information to the single spill
directory name. The previous change use the node ID as a parent
directory, which turns out not to work well in practice.

closes #924


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

Branch: refs/heads/master
Commit: d1a6134b441aebd7b05c9c7bc9ef4780707a41e3
Parents: a51c98b
Author: Paul Rogers <progers@maprtech.com>
Authored: Fri Aug 25 21:28:29 2017 -0700
Committer: Paul Rogers <progers@maprtech.com>
Committed: Tue Aug 29 16:01:22 2017 -0700

----------------------------------------------------------------------
 .../java/org/apache/drill/exec/physical/impl/spill/SpillSet.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/d1a6134b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/spill/SpillSet.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/spill/SpillSet.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/spill/SpillSet.java
index c96c5dc..a269954 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/spill/SpillSet.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/spill/SpillSet.java
@@ -29,7 +29,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.directory.api.util.Strings;
 import org.apache.drill.common.config.DrillConfig;
 import org.apache.drill.common.exceptions.UserException;
 import org.apache.drill.exec.ExecConstants;
@@ -427,7 +426,7 @@ public class SpillSet {
 
     String nodeDir = "";
     if (ep != null  &&  ep.getAddress() != null) {
-      nodeDir = ep.getAddress() + "-" + ep.getUserPort() + "/";
+      nodeDir = ep.getAddress() + "-" + ep.getUserPort() + "_";
     }
     spillDirName = String.format("%s%s_%s_%s-%s-%s",
         nodeDir,


Mime
View raw message