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 ka...@apache.org on 2016/01/13 21:29:50 UTC
hadoop git commit: YARN-4551. Address the duplication between
StatusUpdateWhenHealthy and StatusUpdateWhenUnhealthy transitions. (Sunil G
via kasha) (cherry picked from commit
321072ba8114ed5ad2e9c5c2cfd7e1a54def6ebe)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 2ea99ee35 -> a1ff0b414
YARN-4551. Address the duplication between StatusUpdateWhenHealthy and StatusUpdateWhenUnhealthy transitions. (Sunil G via kasha)
(cherry picked from commit 321072ba8114ed5ad2e9c5c2cfd7e1a54def6ebe)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a1ff0b41
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a1ff0b41
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a1ff0b41
Branch: refs/heads/branch-2
Commit: a1ff0b4145d58822bc2cdac6d114fcb6eeb87bd3
Parents: 2ea99ee
Author: Karthik Kambatla <ka...@apache.org>
Authored: Wed Jan 13 12:09:34 2016 -0800
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Wed Jan 13 12:09:58 2016 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 ++
.../resourcemanager/rmnode/RMNodeImpl.java | 38 ++++++++++----------
2 files changed, 21 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a1ff0b41/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index e252a69..b049341 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -33,6 +33,9 @@ Release 2.9.0 - UNRELEASED
YARN-4571. Make app id/name available to the yarn authorizer provider for
better auditing. (Jian He via wangda)
+ YARN-4551. Address the duplication between StatusUpdateWhenHealthy and
+ StatusUpdateWhenUnhealthy transitions. (Sunil G via kasha)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a1ff0b41/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.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/rmnode/RMNodeImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java
index 8448287..3873e5f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java
@@ -744,6 +744,20 @@ public class RMNodeImpl implements RMNode, EventHandler<RMNodeEvent> {
rmNode.totalCapability = resourceOption.getResource();
}
+ private static NodeHealthStatus updateRMNodeFromStatusEvents(
+ RMNodeImpl rmNode, RMNodeStatusEvent statusEvent) {
+ // Switch the last heartbeatresponse.
+ rmNode.latestNodeHeartBeatResponse = statusEvent.getLatestResponse();
+ NodeHealthStatus remoteNodeHealthStatus = statusEvent.getNodeHealthStatus();
+ rmNode.setHealthReport(remoteNodeHealthStatus.getHealthReport());
+ rmNode.setLastHealthReportTime(remoteNodeHealthStatus
+ .getLastHealthReportTime());
+ rmNode.setAggregatedContainersUtilization(statusEvent
+ .getAggregatedContainersUtilization());
+ rmNode.setNodeUtilization(statusEvent.getNodeUtilization());
+ return remoteNodeHealthStatus;
+ }
+
public static class AddNodeTransition implements
SingleArcTransition<RMNodeImpl, RMNodeEvent> {
@@ -1069,17 +1083,8 @@ public class RMNodeImpl implements RMNode, EventHandler<RMNodeEvent> {
RMNodeStatusEvent statusEvent = (RMNodeStatusEvent) event;
- // Switch the last heartbeatresponse.
- rmNode.latestNodeHeartBeatResponse = statusEvent.getLatestResponse();
-
- NodeHealthStatus remoteNodeHealthStatus =
- statusEvent.getNodeHealthStatus();
- rmNode.setHealthReport(remoteNodeHealthStatus.getHealthReport());
- rmNode.setLastHealthReportTime(
- remoteNodeHealthStatus.getLastHealthReportTime());
- rmNode.setAggregatedContainersUtilization(
- statusEvent.getAggregatedContainersUtilization());
- rmNode.setNodeUtilization(statusEvent.getNodeUtilization());
+ NodeHealthStatus remoteNodeHealthStatus = updateRMNodeFromStatusEvents(
+ rmNode, statusEvent);
NodeState initialState = rmNode.getState();
boolean isNodeDecommissioning =
initialState.equals(NodeState.DECOMMISSIONING);
@@ -1151,15 +1156,8 @@ public class RMNodeImpl implements RMNode, EventHandler<RMNodeEvent> {
RMNodeStatusEvent statusEvent = (RMNodeStatusEvent)event;
// Switch the last heartbeatresponse.
- rmNode.latestNodeHeartBeatResponse = statusEvent.getLatestResponse();
- NodeHealthStatus remoteNodeHealthStatus =
- statusEvent.getNodeHealthStatus();
- rmNode.setHealthReport(remoteNodeHealthStatus.getHealthReport());
- rmNode.setLastHealthReportTime(
- remoteNodeHealthStatus.getLastHealthReportTime());
- rmNode.setAggregatedContainersUtilization(
- statusEvent.getAggregatedContainersUtilization());
- rmNode.setNodeUtilization(statusEvent.getNodeUtilization());
+ NodeHealthStatus remoteNodeHealthStatus = updateRMNodeFromStatusEvents(
+ rmNode, statusEvent);
if (remoteNodeHealthStatus.getIsNodeHealthy()) {
rmNode.context.getDispatcher().getEventHandler().handle(
new NodeAddedSchedulerEvent(rmNode));