You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2017/08/21 17:46:21 UTC
hadoop git commit: YARN-6323. Rolling upgrade/config change is broken
on timeline v2. (Vrushali C via Haibo Chen)
Repository: hadoop
Updated Branches:
refs/heads/YARN-5355 73ee0d4fc -> d337336cb
YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d337336c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d337336c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d337336c
Branch: refs/heads/YARN-5355
Commit: d337336cbf33705f70817eb0593ff214141ef81a
Parents: 73ee0d4
Author: Haibo Chen <ha...@apache.org>
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Haibo Chen <ha...@apache.org>
Committed: Mon Aug 21 10:45:10 2017 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/yarn/conf/YarnConfiguration.java | 2 ++
.../containermanager/ContainerManagerImpl.java | 10 ++++++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d337336c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 2d44358..f305c44 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -2163,6 +2163,8 @@ public class YarnConfiguration extends Configuration {
public static final int DEFAULT_NUMBER_OF_ASYNC_ENTITIES_TO_MERGE = 10;
+ /** default version for any flow. */
+ public static final String DEFAULT_FLOW_VERSION = "1";
/**
* The time period for which timeline v2 client will wait for draining
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d337336c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
index 37dd598..38e01ba 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
@@ -394,6 +394,16 @@ public class ContainerManagerImpl extends CompositeService implements
LOG.debug(
"Recovering Flow context: " + fc + " for an application " + appId);
}
+ } else {
+ // in upgrade situations, where there is no prior existing flow context,
+ // default would be used.
+ fc = new FlowContext(TimelineUtils.generateDefaultFlowName(null, appId),
+ YarnConfiguration.DEFAULT_FLOW_VERSION, appId.getClusterTimestamp());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(
+ "No prior existing flow context found. Using default Flow context: "
+ + fc + " for an application " + appId);
+ }
}
LOG.info("Recovering application " + appId);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org