[41/50] [abbrv] hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-10-17 Thread varunsaxena 
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/0f51f150
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f51f150
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f51f150

Branch: refs/heads/YARN-5355_branch2
Commit: 0f51f1509704b72381ac364592e8f86353806dc4
Parents: cbd5e89
Author: Haibo Chen 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Varun Saxena 
Committed: Tue Oct 17 23:36:40 2017 +0530

--
 .../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/0f51f150/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 6117d2e..fb9fb53 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
@@ -2312,6 +2312,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/0f51f150/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 1012a0e..4bdea32 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
@@ -410,6 +410,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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[33/50] [abbrv] hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-10-17 Thread varunsaxena 
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/0f51f150
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f51f150
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f51f150

Branch: refs/heads/branch-2
Commit: 0f51f1509704b72381ac364592e8f86353806dc4
Parents: cbd5e89
Author: Haibo Chen 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Varun Saxena 
Committed: Tue Oct 17 23:36:40 2017 +0530

--
 .../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/0f51f150/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 6117d2e..fb9fb53 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
@@ -2312,6 +2312,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/0f51f150/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 1012a0e..4bdea32 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
@@ -410,6 +410,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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[44/50] [abbrv] hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-10-14 Thread varunsaxena 
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/ccab7592
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ccab7592
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ccab7592

Branch: refs/heads/YARN-5355_branch2
Commit: ccab75928011329913fa7545bc1e57a82d7ab8bf
Parents: 9c926b5
Author: Haibo Chen 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Varun Saxena 
Committed: Sat Oct 14 15:12:19 2017 +0530

--
 .../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/ccab7592/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 6117d2e..fb9fb53 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
@@ -2312,6 +2312,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/ccab7592/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 6953112..a5c948f 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
@@ -402,6 +402,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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[34/50] [abbrv] hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-08-31 Thread stevel 
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/9b08f365
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9b08f365
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9b08f365

Branch: refs/heads/HADOOP-13345
Commit: 9b08f365d749185d7ed8e34dc379b2e415a29e99
Parents: b2efebd
Author: Haibo Chen 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Varun Saxena 
Committed: Wed Aug 30 11:29:54 2017 +0530

--
 .../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/9b08f365/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 8a513ac..be45ddf 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
@@ -2221,6 +2221,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/9b08f365/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 c7880d5..e497f62 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
@@ -402,6 +402,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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[06/50] [abbrv] hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-08-30 Thread wangda 
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/9b08f365
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9b08f365
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9b08f365

Branch: refs/heads/YARN-3926
Commit: 9b08f365d749185d7ed8e34dc379b2e415a29e99
Parents: b2efebd
Author: Haibo Chen 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Varun Saxena 
Committed: Wed Aug 30 11:29:54 2017 +0530

--
 .../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/9b08f365/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 8a513ac..be45ddf 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
@@ -2221,6 +2221,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/9b08f365/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 c7880d5..e497f62 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
@@ -402,6 +402,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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[42/50] [abbrv] hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-08-30 Thread varunsaxena 
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/1a748b6b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a748b6b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a748b6b

Branch: refs/heads/YARN-5355_branch2
Commit: 1a748b6b41bff07c62a2889b7a1205d53b1c3377
Parents: ab9c37b
Author: Haibo Chen 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Varun Saxena 
Committed: Thu Aug 31 01:41:58 2017 +0530

--
 .../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/1a748b6b/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 2463c45..4422f57 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
@@ -2192,6 +2192,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/1a748b6b/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 5b3edce..c453767 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
@@ -402,6 +402,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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[49/50] [abbrv] hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-08-30 Thread varunsaxena 
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/9b08f365
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9b08f365
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9b08f365

Branch: refs/heads/trunk
Commit: 9b08f365d749185d7ed8e34dc379b2e415a29e99
Parents: b2efebd
Author: Haibo Chen 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Varun Saxena 
Committed: Wed Aug 30 11:29:54 2017 +0530

--
 .../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/9b08f365/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 8a513ac..be45ddf 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
@@ -2221,6 +2221,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/9b08f365/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 c7880d5..e497f62 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
@@ -402,6 +402,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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[50/50] [abbrv] hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-08-29 Thread varunsaxena 
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/709ed053
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/709ed053
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/709ed053

Branch: refs/heads/YARN-5355
Commit: 709ed0533a66a55302b73d82d0a7e38b57d084cf
Parents: 393b745
Author: Haibo Chen 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Varun Saxena 
Committed: Wed Aug 30 01:18:45 2017 +0530

--
 .../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/709ed053/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 4fd2482..a330242 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
@@ -2221,6 +2221,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/709ed053/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 c7880d5..e497f62 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
@@ -402,6 +402,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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-08-22 Thread haibochen 
Repository: hadoop
Updated Branches:
  refs/heads/YARN-5355_branch2 371565911 -> f8711ad13


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/f8711ad1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f8711ad1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f8711ad1

Branch: refs/heads/YARN-5355_branch2
Commit: f8711ad13bcf19f69e8c561400ed77dbd03db069
Parents: 3715659
Author: Haibo Chen 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Haibo Chen 
Committed: Tue Aug 22 08:28:51 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/f8711ad1/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 d16b1ee..a97cb31 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
@@ -2145,6 +2145,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/f8711ad1/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 a9d5f47..c3a4866 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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[50/51] [abbrv] hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-08-22 Thread varunsaxena 
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/6a6ff7b2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6a6ff7b2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6a6ff7b2

Branch: refs/heads/YARN-5355
Commit: 6a6ff7b2b9afe42b56c3d9bbf6cc1693c9d7641e
Parents: ebf285a
Author: Haibo Chen 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Varun Saxena 
Committed: Tue Aug 22 19:03:05 2017 +0530

--
 .../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/6a6ff7b2/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 641c6a8..876ae94 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
@@ -2211,6 +2211,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/6a6ff7b2/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 c7880d5..e497f62 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
@@ -402,6 +402,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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[46/50] [abbrv] hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-08-22 Thread varunsaxena 
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/8a5b37a4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8a5b37a4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8a5b37a4

Branch: refs/heads/YARN-5355
Commit: 8a5b37a4a4a74a860400668d15ac98488824c9e1
Parents: aebc9d2
Author: Haibo Chen 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Varun Saxena 
Committed: Tue Aug 22 18:00:34 2017 +0530

--
 .../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/8a5b37a4/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 641c6a8..876ae94 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
@@ -2211,6 +2211,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/8a5b37a4/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 8511889..a75480c 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
@@ -401,6 +401,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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-08-21 Thread haibochen 
Repository: hadoop
Updated Branches:
  refs/heads/YARN-5355-branch-2 [created] 021f2e0e7


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/021f2e0e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/021f2e0e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/021f2e0e

Branch: refs/heads/YARN-5355-branch-2
Commit: 021f2e0e758e3155cfbf995cde2d9a53a72645d4
Parents: 6d72dda
Author: Haibo Chen 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Haibo Chen 
Committed: Mon Aug 21 10:47:14 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/021f2e0e/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 347c8fd..ff28b53 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
@@ -2110,6 +2110,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/021f2e0e/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 a9d5f47..c3a4866 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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: YARN-6323. Rolling upgrade/config change is broken on timeline v2. (Vrushali C via Haibo Chen)

2017-08-21 Thread haibochen 
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 
Authored: Mon Aug 21 10:45:10 2017 -0700
Committer: Haibo Chen 
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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org