You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by jm...@apache.org on 2014/07/31 22:10:45 UTC

git commit: SLIDER-266 do not specify HADOOP_USER_NAME for secure cluster launch

Repository: incubator-slider
Updated Branches:
  refs/heads/develop 57328d04b -> 2ee8374eb


SLIDER-266 do not specify HADOOP_USER_NAME for secure cluster launch


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

Branch: refs/heads/develop
Commit: 2ee8374eb3e7afbd1c25c737de639506d1a808e1
Parents: 57328d0
Author: Jon Maron <jm...@hortonworks.com>
Authored: Thu Jul 31 16:10:04 2014 -0400
Committer: Jon Maron <jm...@hortonworks.com>
Committed: Thu Jul 31 16:10:04 2014 -0400

----------------------------------------------------------------------
 .../org/apache/slider/providers/agent/AgentProviderService.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2ee8374e/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
index d3a2683..a73aaab 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
@@ -210,7 +210,9 @@ public class AgentProviderService extends AbstractProviderService implements
     String logDir = ApplicationConstants.Environment.LOG_DIRS.$();
     launcher.setEnv("AGENT_LOG_ROOT", logDir);
     log.info("AGENT_LOG_ROOT set to {}", logDir);
-    launcher.setEnv(HADOOP_USER_NAME, System.getenv(HADOOP_USER_NAME));
+    if (System.getenv(HADOOP_USER_NAME) != null) {
+      launcher.setEnv(HADOOP_USER_NAME, System.getenv(HADOOP_USER_NAME));
+    }
     // for 2-Way SSL
     launcher.setEnv(SLIDER_PASSPHRASE, SliderKeys.PASSPHRASE);