You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by tg...@apache.org on 2014/04/17 17:31:58 UTC
svn commit: r1588287 - in
/hadoop/common/branches/branch-2.4/hadoop-yarn-project: CHANGES.txt
hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java
Author: tgraves
Date: Thu Apr 17 15:31:58 2014
New Revision: 1588287
URL: http://svn.apache.org/r1588287
Log:
Merge 1588281 to branch-2.4. YARN-1931. Private API change in YARN-1824 in 2.4 broke compatibility with previous releases (Sandy Ryza via tgraves)
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt?rev=1588287&r1=1588286&r2=1588287&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt Thu Apr 17 15:31:58 2014
@@ -61,6 +61,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
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java?rev=1588287&r1=1588286&r2=1588287&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java Thu Apr 17 15:31:58 2014
@@ -38,7 +38,7 @@ import org.apache.hadoop.yarn.api.record
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