Merge 1588281 to branch-2. YARN-1931. Private API change in YARN-1824 in 2.4 broke compatibility with previous releases (Sandy Ryza via tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588283 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2014-04-17 15:25:27 +00:00
parent 641cbc0feb
commit bbabbe5ccb
2 changed files with 27 additions and 1 deletions

View File

@ -114,6 +114,9 @@ Release 2.4.1 - UNRELEASED
YARN-1934. Fixed a potential NPE in ZKRMStateStore caused by handling
Disconnected event from ZK. (Karthik Kambatla via jianhe)
YARN-1931. Private API change in YARN-1824 in 2.4 broke compatibility
with previous releases (Sandy Ryza via tgraves)
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES

View File

@ -38,7 +38,7 @@ import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
/**
* Yarn application related utilities
* Yarn internal application-related utilities
*/
@Private
public class Apps {
@ -97,6 +97,17 @@ public class Apps {
}
}
}
/**
* This older version of this method is kept around for compatibility
* because downstream frameworks like Spark and Tez have been using it.
* Downstream frameworks are expected to move off of it.
*/
@Deprecated
public static void setEnvFromInputString(Map<String, String> env,
String envString) {
setEnvFromInputString(env, envString, File.pathSeparator);
}
@Public
@Unstable
@ -112,6 +123,18 @@ public class Apps {
environment.put(StringInterner.weakIntern(variable),
StringInterner.weakIntern(val));
}
/**
* This older version of this method is kept around for compatibility
* because downstream frameworks like Spark and Tez have been using it.
* Downstream frameworks are expected to move off of it.
*/
@Deprecated
public static void addToEnvironment(
Map<String, String> environment,
String variable, String value) {
addToEnvironment(environment, variable, value, File.pathSeparator);
}
public static String crossPlatformify(String var) {
return ApplicationConstants.PARAMETER_EXPANSION_LEFT + var