hadoop git commit: YARN-3896. RMNode transitioned from RUNNING to REBOOTED because its response id has not been reset synchronously. (Jun Gong via rohithsharmaks) (cherry picked from commit feaf034994

2015-10-08 Thread jlowe 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 784d00e0e -> fe874e9f6


YARN-3896. RMNode transitioned from RUNNING to REBOOTED because its response id 
has not been reset synchronously. (Jun Gong via rohithsharmaks)
(cherry picked from commit feaf0349949e831ce3f25814c1bbff52f17bfe8f)

Conflicts:

hadoop-yarn-project/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fe874e9f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fe874e9f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fe874e9f

Branch: refs/heads/branch-2.7
Commit: fe874e9f6971ce68e527617a466e985cc4e9d96e
Parents: 784d00e
Author: Jason Lowe 
Authored: Thu Oct 8 16:08:55 2015 +
Committer: Jason Lowe 
Committed: Thu Oct 8 16:08:55 2015 +

--
 .../hadoop/yarn/sls/nodemanager/NodeInfo.java   |  3 ++
 .../yarn/sls/scheduler/RMNodeWrapper.java   |  5 +++
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../resourcemanager/ResourceTrackerService.java |  2 +
 .../server/resourcemanager/rmnode/RMNode.java   |  7 +++-
 .../resourcemanager/rmnode/RMNodeImpl.java  | 15 +---
 .../yarn/server/resourcemanager/MockNodes.java  |  4 ++
 .../resourcetracker/TestNMReconnect.java| 39 
 8 files changed, 72 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/fe874e9f/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
index ee6eb7b..dbea90f 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
@@ -143,6 +143,9 @@ public class NodeInfo {
   return null;
 }
 
+public void resetLastNodeHeartBeatResponse() {
+}
+
 public List pullContainerUpdates() {
   ArrayList list = new 
ArrayList();
   

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fe874e9f/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
index b64be1b..356b8bd 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
@@ -130,6 +130,11 @@ public class RMNodeWrapper implements RMNode {
   }
 
   @Override
+  public void resetLastNodeHeartBeatResponse() {
+node.getLastNodeHeartBeatResponse().setResponseId(0);
+  }
+
+  @Override
   @SuppressWarnings("unchecked")
   public List pullContainerUpdates() {
 List list = Collections.EMPTY_LIST;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fe874e9f/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 15a58dd..c1724c8 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -106,6 +106,9 @@ Release 2.7.2 - UNRELEASED
 YARN-3802. Two RMNodes for the same NodeId are used in RM sometimes
 after NM is reconnected. (zhihai xu via xgong)
 
+YARN-3896. RMNode transitioned from RUNNING to REBOOTED because its 
response id 
+has not been reset synchronously. (Jun Gong via rohithsharmaks)
+
 Release 2.7.1 - 2015-07-06
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fe874e9f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
index 0de556b..b859a7c 100644
---

hadoop git commit: YARN-3896. RMNode transitioned from RUNNING to REBOOTED because its response id has not been reset synchronously. (Jun Gong via rohithsharmaks) (cherry picked from commit feaf034994

2015-10-08 Thread jlowe 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.6 528b809d2 -> ac865de72


YARN-3896. RMNode transitioned from RUNNING to REBOOTED because its response id 
has not been reset synchronously. (Jun Gong via rohithsharmaks)
(cherry picked from commit feaf0349949e831ce3f25814c1bbff52f17bfe8f)

Conflicts:

hadoop-yarn-project/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ac865de7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ac865de7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ac865de7

Branch: refs/heads/branch-2.6
Commit: ac865de725948569932d2e054703f6ba866484f7
Parents: 528b809
Author: Jason Lowe 
Authored: Thu Oct 8 16:39:46 2015 +
Committer: Jason Lowe 
Committed: Thu Oct 8 16:39:46 2015 +

--
 .../hadoop/yarn/sls/nodemanager/NodeInfo.java   |  3 ++
 .../yarn/sls/scheduler/RMNodeWrapper.java   |  5 +++
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../resourcemanager/ResourceTrackerService.java |  2 +
 .../server/resourcemanager/rmnode/RMNode.java   |  7 +++-
 .../resourcemanager/rmnode/RMNodeImpl.java  | 15 +---
 .../yarn/server/resourcemanager/MockNodes.java  |  4 ++
 .../resourcetracker/TestNMReconnect.java| 39 
 8 files changed, 72 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac865de7/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
index ee6eb7b..dbea90f 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
@@ -143,6 +143,9 @@ public class NodeInfo {
   return null;
 }
 
+public void resetLastNodeHeartBeatResponse() {
+}
+
 public List pullContainerUpdates() {
   ArrayList list = new 
ArrayList();
   

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac865de7/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
index b64be1b..356b8bd 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
@@ -130,6 +130,11 @@ public class RMNodeWrapper implements RMNode {
   }
 
   @Override
+  public void resetLastNodeHeartBeatResponse() {
+node.getLastNodeHeartBeatResponse().setResponseId(0);
+  }
+
+  @Override
   @SuppressWarnings("unchecked")
   public List pullContainerUpdates() {
 List list = Collections.EMPTY_LIST;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac865de7/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 5fc76b3..d4dd07d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -42,6 +42,9 @@ Release 2.6.2 - UNRELEASED
 YARN-3194. RM should handle NMContainerStatuses sent by NM while
 registering if NM is Reconnected node (Rohith via jlowe)
 
+YARN-3896. RMNode transitioned from RUNNING to REBOOTED because its 
response id 
+has not been reset synchronously. (Jun Gong via rohithsharmaks)
+
 Release 2.6.1 - 2015-09-23
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac865de7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
index 29a6920..1352cc5 100644
---