You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/01/15 13:10:11 UTC
incubator-slider git commit: SLIDER-737 add LANG=en_US when executing
shell command (contributed by Yang Hao)
Repository: incubator-slider
Updated Branches:
refs/heads/develop 2522f65b3 -> 7f8c5b23f
SLIDER-737 add LANG=en_US when executing shell command (contributed by Yang Hao)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7f8c5b23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7f8c5b23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7f8c5b23
Branch: refs/heads/develop
Commit: 7f8c5b23fc1ccd54dee9543e1e284a28102eac21
Parents: 2522f65
Author: Steve Loughran <st...@apache.org>
Authored: Thu Jan 15 12:09:07 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Jan 15 12:09:07 2015 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/slider/client/SliderClient.java | 4 ++++
.../org/apache/slider/providers/agent/AgentProviderService.java | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7f8c5b23/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index e6a18bc..ace5f09 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -1571,6 +1571,10 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
getConfig(),
usingMiniMRCluster);
amLauncher.setClasspath(classpath);
+ //add english env
+ amLauncher.setEnv("LANG", "en_US.UTF-8");
+ amLauncher.setEnv("LC_ALL", "en_US.UTF-8");
+ amLauncher.setEnv("LANGUAGE", "en_US.UTF-8");
if (log.isDebugEnabled()) {
log.debug("AM classpath={}", classpath);
log.debug("Environment Map:\n{}",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7f8c5b23/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 65888c4..e4680e2 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
@@ -318,6 +318,10 @@ public class AgentProviderService extends AbstractProviderService implements
}
// for 2-Way SSL
launcher.setEnv(SLIDER_PASSPHRASE, instanceDefinition.getPassphrase());
+ //add english env
+ launcher.setEnv("LANG", "en_US.UTF-8");
+ launcher.setEnv("LC_ALL", "en_US.UTF-8");
+ launcher.setEnv("LANGUAGE", "en_US.UTF-8");
//local resources