Repository: incubator-apex-core Updated Branches: refs/heads/release-3.2 b2838e47e -> 5b66f7a0a
APEXCORE-352 removed all hardcoded tmp directory locations Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/5b66f7a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/5b66f7a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/5b66f7a0 Branch: refs/heads/release-3.2 Commit: 5b66f7a0a0ce96d39482972288deb68da90b3681 Parents: b2838e4 Author: David Yan <[email protected]> Authored: Tue Feb 23 18:20:17 2016 -0800 Committer: David Yan <[email protected]> Committed: Wed Feb 24 16:59:39 2016 -0800 ---------------------------------------------------------------------- engine/src/main/java/com/datatorrent/stram/StramClient.java | 2 +- engine/src/main/java/com/datatorrent/stram/cli/DTCli.java | 2 +- .../src/main/java/com/datatorrent/stram/client/AppPackage.java | 5 +++-- .../main/java/com/datatorrent/stram/client/ConfigPackage.java | 3 ++- .../java/com/datatorrent/stram/client/StramClientUtils.java | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/5b66f7a0/engine/src/main/java/com/datatorrent/stram/StramClient.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/StramClient.java b/engine/src/main/java/com/datatorrent/stram/StramClient.java index 7abfc82..141b11e 100644 --- a/engine/src/main/java/com/datatorrent/stram/StramClient.java +++ b/engine/src/main/java/com/datatorrent/stram/StramClient.java @@ -551,7 +551,7 @@ public class StramClient vargs.add("-Djava.io.tmpdir=" + tmpDir); vargs.add("-Xmx" + (amMemory * 3 / 4) + "m"); vargs.add("-XX:+HeapDumpOnOutOfMemoryError"); - vargs.add("-XX:HeapDumpPath=/tmp/dt-heap-" + appId.getId() + ".bin"); + vargs.add("-XX:HeapDumpPath=" + System.getProperty("java.io.tmpdir") + "/dt-heap-" + appId.getId() + ".bin"); vargs.add("-Dhadoop.root.logger=" + (dag.isDebug() ? "DEBUG" : "INFO") + ",RFA"); vargs.add("-Dhadoop.log.dir=" + ApplicationConstants.LOG_DIR_EXPANSION_VAR); vargs.add(String.format("-D%s=%s", StreamingContainer.PROP_APP_PATH, dag.assertAppPath())); http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/5b66f7a0/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java b/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java index e126f73..8a70a56 100644 --- a/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java +++ b/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java @@ -2917,7 +2917,7 @@ public class DTCli private File copyToLocal(String[] files) throws IOException { - File tmpDir = new File("/tmp/datatorrent/" + ManagementFactory.getRuntimeMXBean().getName()); + File tmpDir = new File(System.getProperty("java.io.tmpdir") + "/datatorrent/" + ManagementFactory.getRuntimeMXBean().getName()); tmpDir.mkdirs(); for (int i = 0; i < files.length; i++) { try { http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/5b66f7a0/engine/src/main/java/com/datatorrent/stram/client/AppPackage.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/client/AppPackage.java b/engine/src/main/java/com/datatorrent/stram/client/AppPackage.java index cbe63f2..20f560e 100644 --- a/engine/src/main/java/com/datatorrent/stram/client/AppPackage.java +++ b/engine/src/main/java/com/datatorrent/stram/client/AppPackage.java @@ -21,6 +21,7 @@ package com.datatorrent.stram.client; import com.datatorrent.stram.client.StramAppLauncher.AppFactory; import com.datatorrent.stram.plan.logical.LogicalPlan; import java.io.*; +import java.nio.file.Files; import java.util.*; import java.util.jar.*; import net.lingala.zip4j.core.ZipFile; @@ -118,8 +119,8 @@ public class AppPackage extends JarFile FileUtils.forceMkdir(contentFolder); cleanOnClose = false; } else { - cleanOnClose = true; - contentFolder = new File("/tmp/dt-appPackage-" + Long.toString(System.nanoTime())); + cleanOnClose = true; + contentFolder = Files.createTempDirectory("dt-appPackage-").toFile(); } Manifest manifest = getManifest(); http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/5b66f7a0/engine/src/main/java/com/datatorrent/stram/client/ConfigPackage.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/client/ConfigPackage.java b/engine/src/main/java/com/datatorrent/stram/client/ConfigPackage.java index 622665b..57fa060 100644 --- a/engine/src/main/java/com/datatorrent/stram/client/ConfigPackage.java +++ b/engine/src/main/java/com/datatorrent/stram/client/ConfigPackage.java @@ -19,6 +19,7 @@ package com.datatorrent.stram.client; import java.io.*; +import java.nio.file.Files; import java.util.*; import java.util.jar.*; import net.lingala.zip4j.core.ZipFile; @@ -93,7 +94,7 @@ public class ConfigPackage extends JarFile implements Closeable if (zipFile.isEncrypted()) { throw new ZipException("Encrypted conf package not supported yet"); } - File newDirectory = new File("/tmp/dt-configPackage-" + Long.toString(System.nanoTime())); + File newDirectory = Files.createTempDirectory("dt-configPackage-").toFile(); newDirectory.mkdirs(); directory = newDirectory.getAbsolutePath(); zipFile.extractAll(directory); http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/5b66f7a0/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java index d679da4..2033770 100644 --- a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java +++ b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java @@ -382,7 +382,8 @@ public class StramClientUtils fs = newFileSystemInstance(conf); // after getting the dfsRootDirectory config parameter, redo the entire process with the global config // load global settings from DFS - targetGlobalFile = new File(String.format("/tmp/dt-site-global-%s.xml", UserGroupInformation.getLoginUser().getShortUserName())); + targetGlobalFile = new File(String.format("%s/dt-site-global-%s.xml", System.getProperty("java.io.tmpdir"), + UserGroupInformation.getLoginUser().getShortUserName())); org.apache.hadoop.fs.Path hdfsGlobalPath = new org.apache.hadoop.fs.Path(StramClientUtils.getDTDFSConfigDir(fs, conf), StramClientUtils.DT_SITE_GLOBAL_XML_FILE); LOG.debug("Copying global dt-site.xml from {} to {}", hdfsGlobalPath, targetGlobalFile.getAbsolutePath()); fs.copyToLocalFile(hdfsGlobalPath, new org.apache.hadoop.fs.Path(targetGlobalFile.toURI()));
