You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-issues@hadoop.apache.org by GitBox <gi...@apache.org> on 2020/08/14 19:35:51 UTC
[GitHub] [hadoop] zhengbli commented on a change in pull request #2228: YARN-10399 Refactor NodeQueueLoadMonitor class to make it extendable
zhengbli commented on a change in pull request #2228:
URL: https://github.com/apache/hadoop/pull/2228#discussion_r470829324
##########
File path: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/distributed/NodeQueueLoadMonitor.java
##########
@@ -260,55 +236,72 @@ public void updateNode(RMNode rmNode) {
opportunisticContainersStatus =
OpportunisticContainersStatus.newInstance();
}
- int opportQueueCapacity =
- opportunisticContainersStatus.getOpportQueueCapacity();
- int estimatedQueueWaitTime =
- opportunisticContainersStatus.getEstimatedQueueWaitTime();
- int waitQueueLength = opportunisticContainersStatus.getWaitQueueLength();
+
// Add nodes to clusterNodes. If estimatedQueueTime is -1, ignore node
// UNLESS comparator is based on queue length.
ReentrantReadWriteLock.WriteLock writeLock = clusterNodesLock.writeLock();
writeLock.lock();
try {
- ClusterNode currentNode = this.clusterNodes.get(rmNode.getNodeID());
- if (currentNode == null) {
- if (rmNode.getState() != NodeState.DECOMMISSIONING &&
- (estimatedQueueWaitTime != -1 ||
- comparator == LoadComparator.QUEUE_LENGTH)) {
- this.clusterNodes.put(rmNode.getNodeID(),
- new ClusterNode(rmNode.getNodeID())
- .setQueueWaitTime(estimatedQueueWaitTime)
- .setQueueLength(waitQueueLength)
- .setQueueCapacity(opportQueueCapacity));
- LOG.info("Inserting ClusterNode [" + rmNode.getNodeID() + "] " +
- "with queue wait time [" + estimatedQueueWaitTime + "] and " +
- "wait queue length [" + waitQueueLength + "]");
- } else {
- LOG.warn("IGNORING ClusterNode [" + rmNode.getNodeID() + "] " +
- "with queue wait time [" + estimatedQueueWaitTime + "] and " +
- "wait queue length [" + waitQueueLength + "]");
- }
+ ClusterNode clusterNode = this.clusterNodes.get(rmNode.getNodeID());
+ if (clusterNode == null) {
+ onNewNodeAdded(rmNode, opportunisticContainersStatus);
} else {
- if (rmNode.getState() != NodeState.DECOMMISSIONING &&
- (estimatedQueueWaitTime != -1 ||
- comparator == LoadComparator.QUEUE_LENGTH)) {
- currentNode
+ onExistingNodeUpdated(rmNode, clusterNode, opportunisticContainersStatus);
+ }
+ } finally {
+ writeLock.unlock();
+ }
+ }
+
+ protected void onNewNodeAdded(
+ RMNode rmNode, OpportunisticContainersStatus status) {
+ int opportQueueCapacity = status.getOpportQueueCapacity();
+ int estimatedQueueWaitTime = status.getEstimatedQueueWaitTime();
+ int waitQueueLength = status.getWaitQueueLength();
+
+ if (rmNode.getState() != NodeState.DECOMMISSIONING &&
+ (estimatedQueueWaitTime != -1 ||
+ comparator == LoadComparator.QUEUE_LENGTH)) {
+ this.clusterNodes.put(rmNode.getNodeID(),
+ new ClusterNode(rmNode.getNodeID())
.setQueueWaitTime(estimatedQueueWaitTime)
.setQueueLength(waitQueueLength)
- .updateTimestamp();
- LOG.debug("Updating ClusterNode [{}] with queue wait time [{}] and"
+ .setNodeLabels(rmNode.getNodeLabels())
+ .setQueueCapacity(opportQueueCapacity));
+ LOG.info("Inserting ClusterNode [" + rmNode.getNodeID() + "] " +
Review comment:
Updated
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-issues-help@hadoop.apache.org