You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2015/09/12 00:19:02 UTC
incubator-apex-core git commit: APEX-115 #resolve
Repository: incubator-apex-core
Updated Branches:
refs/heads/devel-3 4023ce01d -> c34909004
APEX-115 #resolve
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/c3490900
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/c3490900
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/c3490900
Branch: refs/heads/devel-3
Commit: c349090049c14564ce9468c0c4ddae2c54d042f7
Parents: 4023ce0
Author: Gaurav <ga...@datatorrent.com>
Authored: Fri Sep 11 13:05:17 2015 -0700
Committer: Gaurav <ga...@datatorrent.com>
Committed: Fri Sep 11 13:05:17 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/stram/StreamingAppMasterService.java | 3 ++-
.../java/com/datatorrent/stram/engine/StreamingContainer.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/c3490900/engine/src/main/java/com/datatorrent/stram/StreamingAppMasterService.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/StreamingAppMasterService.java b/engine/src/main/java/com/datatorrent/stram/StreamingAppMasterService.java
index 98c78de..2c8e646 100644
--- a/engine/src/main/java/com/datatorrent/stram/StreamingAppMasterService.java
+++ b/engine/src/main/java/com/datatorrent/stram/StreamingAppMasterService.java
@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlElement;
import com.google.common.collect.Maps;
+import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -709,7 +710,7 @@ public class StreamingAppMasterService extends CompositeService
if (UserGroupInformation.isSecurityEnabled() && System.currentTimeMillis() >= expiryTime && hdfsKeyTabFile != null) {
String applicationId = appAttemptID.getApplicationId().toString();
- expiryTime = StramUserLogin.refreshTokens(tokenLifeTime, "." + File.separator + "tmp", applicationId, conf, hdfsKeyTabFile, credentials, rmAddress, true);
+ expiryTime = StramUserLogin.refreshTokens(tokenLifeTime, FileUtils.getTempDirectoryPath(), applicationId, conf, hdfsKeyTabFile, credentials, rmAddress, true);
}
Runnable r;
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/c3490900/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java b/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
index 2705093..5c740be 100644
--- a/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
+++ b/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
@@ -34,6 +34,7 @@ import java.util.concurrent.CountDownLatch;
import net.engio.mbassy.bus.MBassador;
import net.engio.mbassy.bus.config.BusConfiguration;
+import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -599,7 +600,7 @@ public class StreamingContainer extends YarnContainerMain
while (!exitHeartbeatLoop) {
if (UserGroupInformation.isSecurityEnabled() && System.currentTimeMillis() >= expiryTime && hdfsKeyTabFile != null) {
- expiryTime = StramUserLogin.refreshTokens(tokenLifeTime, "." + File.separator + "tmp", containerId, conf, hdfsKeyTabFile, credentials, null, false);
+ expiryTime = StramUserLogin.refreshTokens(tokenLifeTime, FileUtils.getTempDirectoryPath(), containerId, conf, hdfsKeyTabFile, credentials, null, false);
}
synchronized (this.heartbeatTrigger) {
try {