Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 28D1A17301 for ; Fri, 10 Apr 2015 16:58:12 +0000 (UTC) Received: (qmail 53797 invoked by uid 500); 10 Apr 2015 16:58:11 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 53514 invoked by uid 500); 10 Apr 2015 16:58:11 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 53422 invoked by uid 99); 10 Apr 2015 16:58:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 16:58:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 78593E0414; Fri, 10 Apr 2015 16:58:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jianhe@apache.org To: common-commits@hadoop.apache.org Date: Fri, 10 Apr 2015 16:58:12 -0000 Message-Id: In-Reply-To: <62b7ccf04c5845ada4591017429016ba@git.apache.org> References: <62b7ccf04c5845ada4591017429016ba@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] hadoop git commit: YARN-3348. Add a 'yarn top' tool to help understand cluster usage. Contributed by Varun Vasudev YARN-3348. Add a 'yarn top' tool to help understand cluster usage. Contributed by Varun Vasudev Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/577d755e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/577d755e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/577d755e Branch: refs/heads/trunk Commit: 577d755e4bf72d6adedeba51be01ff5f3f028de0 Parents: 6ac98b4 Author: Jian He Authored: Thu Apr 9 20:24:32 2015 -0700 Committer: Jian He Committed: Fri Apr 10 09:57:17 2015 -0700 ---------------------------------------------------------------------- .../hadoop/mapred/ResourceMgrDelegate.java | 9 + hadoop-yarn-project/CHANGES.txt | 3 + hadoop-yarn-project/hadoop-yarn/bin/yarn | 32 + .../hadoop/yarn/api/records/QueueInfo.java | 23 +- .../yarn/api/records/QueueStatistics.java | 279 +++++ .../yarn/api/records/YarnClusterMetrics.java | 66 ++ .../src/main/proto/yarn_protos.proto | 24 + .../hadoop/yarn/client/api/YarnClient.java | 38 +- .../yarn/client/api/impl/YarnClientImpl.java | 13 + .../apache/hadoop/yarn/client/cli/TopCLI.java | 1099 ++++++++++++++++++ .../hadoop/yarn/client/ProtocolHATestBase.java | 2 +- .../hadoop/yarn/client/cli/TestYarnCLI.java | 4 +- .../api/records/impl/pb/QueueInfoPBImpl.java | 27 + .../records/impl/pb/QueueStatisticsPBImpl.java | 257 ++++ .../impl/pb/YarnClusterMetricsPBImpl.java | 76 +- .../hadoop/yarn/api/TestPBImplRecords.java | 4 +- .../server/resourcemanager/ClientRMService.java | 7 + .../scheduler/capacity/AbstractCSQueue.java | 23 + .../resourcemanager/scheduler/fair/FSQueue.java | 23 + 19 files changed, 1997 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java index 82e8bdb..279c4f1 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java @@ -337,6 +337,15 @@ public class ResourceMgrDelegate extends YarnClient { } @Override + public List getApplications(Set queues, + Set users, Set applicationTypes, + EnumSet applicationStates) throws YarnException, + IOException { + return client.getApplications(queues, users, applicationTypes, + applicationStates); + } + + @Override public YarnClusterMetrics getYarnClusterMetrics() throws YarnException, IOException { return client.getYarnClusterMetrics(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index edd1125..51740f0 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -63,6 +63,9 @@ Release 2.8.0 - UNRELEASED YARN-1376. NM need to notify the log aggregation status to RM through heartbeat. (Xuan Gong via junping_du) + YARN-3348. Add a 'yarn top' tool to help understand cluster usage. (Varun + Vasudev via jianhe) + IMPROVEMENTS YARN-1880. Cleanup TestApplicationClientProtocolOnHA http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/bin/yarn ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn index fddee46..a98f3e6 100644 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn +++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn @@ -40,6 +40,7 @@ function hadoop_usage echo " scmadmin SharedCacheManager admin tools" echo " sharedcachemanager run the SharedCacheManager daemon" echo " timelineserver run the timeline server" + echo " top view cluster information" echo " version print the version" echo "" echo "Most commands print help when invoked w/o parameters." @@ -182,6 +183,37 @@ case "${COMMAND}" in hadoop_debug "Append YARN_CLIENT_OPTS onto HADOOP_OPTS" HADOOP_OPTS="${HADOOP_OPTS} ${YARN_CLIENT_OPTS}" ;; + top) + doNotSetCols=0 + doNotSetRows=0 + for i in "$@"; do + if [[ $i == "-cols" ]]; then + doNotSetCols=1 + fi + if [[ $i == "-rows" ]]; then + doNotSetRows=1 + fi + done + if [ $doNotSetCols == 0 ] && [ -n "${TERM}" ]; then + cols=$(tput cols) + if [ -n "$cols" ]; then + args=( $@ ) + args=("${args[@]}" "-cols" "$cols") + set -- "${args[@]}" + fi + fi + if [ $doNotSetRows == 0 ] && [ -n "${TERM}" ]; then + rows=$(tput lines) + if [ -n "$rows" ]; then + args=( $@ ) + args=("${args[@]}" "-rows" "$rows") + set -- "${args[@]}" + fi + fi + CLASS=org.apache.hadoop.yarn.client.cli.TopCLI + hadoop_debug "Append YARN_CLIENT_OPTS onto HADOOP_OPTS" + HADOOP_OPTS="${HADOOP_OPTS} ${YARN_CLIENT_OPTS}" + ;; *) CLASS="${COMMAND}" if ! hadoop_validate_classname "${CLASS}"; then http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueInfo.java index bee5275..176af84 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueInfo.java @@ -55,7 +55,7 @@ public abstract class QueueInfo { float maximumCapacity, float currentCapacity, List childQueues, List applications, QueueState queueState, Set accessibleNodeLabels, - String defaultNodeLabelExpression) { + String defaultNodeLabelExpression, QueueStatistics queueStatistics) { QueueInfo queueInfo = Records.newRecord(QueueInfo.class); queueInfo.setQueueName(queueName); queueInfo.setCapacity(capacity); @@ -66,6 +66,7 @@ public abstract class QueueInfo { queueInfo.setQueueState(queueState); queueInfo.setAccessibleNodeLabels(accessibleNodeLabels); queueInfo.setDefaultNodeLabelExpression(defaultNodeLabelExpression); + queueInfo.setQueueStatistics(queueStatistics); return queueInfo; } @@ -184,4 +185,24 @@ public abstract class QueueInfo { @Stable public abstract void setDefaultNodeLabelExpression( String defaultLabelExpression); + + /** + * Get the queue stats for the queue + * + * @return queue stats of the queue + */ + @Public + @Unstable + public abstract QueueStatistics getQueueStatistics(); + + /** + * Set the queue statistics for the queue + * + * @param queueStatistics + * the queue statistics + */ + @Public + @Unstable + public abstract void setQueueStatistics(QueueStatistics queueStatistics); + } http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueStatistics.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueStatistics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueStatistics.java new file mode 100644 index 0000000..a93047e --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueStatistics.java @@ -0,0 +1,279 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.api.records; + +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; +import org.apache.hadoop.yarn.util.Records; + +@InterfaceAudience.Public +@InterfaceStability.Unstable +public abstract class QueueStatistics { + + @InterfaceAudience.Private + @InterfaceStability.Unstable + public static QueueStatistics newInstance(long submitted, long running, + long pending, long completed, long killed, long failed, long activeUsers, + long availableMemoryMB, long allocatedMemoryMB, long pendingMemoryMB, + long reservedMemoryMB, long availableVCores, long allocatedVCores, + long pendingVCores, long reservedVCores) { + QueueStatistics statistics = Records.newRecord(QueueStatistics.class); + statistics.setNumAppsSubmitted(submitted); + statistics.setNumAppsRunning(running); + statistics.setNumAppsPending(pending); + statistics.setNumAppsCompleted(completed); + statistics.setNumAppsKilled(killed); + statistics.setNumAppsFailed(failed); + statistics.setNumActiveUsers(activeUsers); + statistics.setAvailableMemoryMB(availableMemoryMB); + statistics.setAllocatedMemoryMB(allocatedMemoryMB); + statistics.setPendingMemoryMB(pendingMemoryMB); + statistics.setReservedMemoryMB(reservedMemoryMB); + statistics.setAvailableVCores(availableVCores); + statistics.setAllocatedVCores(allocatedVCores); + statistics.setPendingVCores(pendingVCores); + statistics.setReservedVCores(reservedVCores); + return statistics; + } + + /** + * Get the number of apps submitted + * + * @return the number of apps submitted + */ + public abstract long getNumAppsSubmitted(); + + /** + * Set the number of apps submitted + * + * @param numAppsSubmitted + * the number of apps submitted + */ + public abstract void setNumAppsSubmitted(long numAppsSubmitted); + + /** + * Get the number of running apps + * + * @return the number of running apps + */ + public abstract long getNumAppsRunning(); + + /** + * Set the number of running apps + * + * @param numAppsRunning + * the number of running apps + */ + public abstract void setNumAppsRunning(long numAppsRunning); + + /** + * Get the number of pending apps + * + * @return the number of pending apps + */ + public abstract long getNumAppsPending(); + + /** + * Set the number of pending apps + * + * @param numAppsPending + * the number of pending apps + */ + public abstract void setNumAppsPending(long numAppsPending); + + /** + * Get the number of completed apps + * + * @return the number of completed apps + */ + public abstract long getNumAppsCompleted(); + + /** + * Set the number of completed apps + * + * @param numAppsCompleted + * the number of completed apps + */ + public abstract void setNumAppsCompleted(long numAppsCompleted); + + /** + * Get the number of killed apps + * + * @return the number of killed apps + */ + public abstract long getNumAppsKilled(); + + /** + * Set the number of killed apps + * + * @param numAppsKilled + * the number of killed apps + */ + public abstract void setNumAppsKilled(long numAppsKilled); + + /** + * Get the number of failed apps + * + * @return the number of failed apps + */ + public abstract long getNumAppsFailed(); + + /** + * Set the number of failed apps + * + * @param numAppsFailed + * the number of failed apps + */ + public abstract void setNumAppsFailed(long numAppsFailed); + + /** + * Get the number of active users + * + * @return the number of active users + */ + public abstract long getNumActiveUsers(); + + /** + * Set the number of active users + * + * @param numActiveUsers + * the number of active users + */ + public abstract void setNumActiveUsers(long numActiveUsers); + + /** + * Get the available memory in MB + * + * @return the available memory + */ + public abstract long getAvailableMemoryMB(); + + /** + * Set the available memory in MB + * + * @param availableMemoryMB + * the available memory + */ + public abstract void setAvailableMemoryMB(long availableMemoryMB); + + /** + * Get the allocated memory in MB + * + * @return the allocated memory + */ + public abstract long getAllocatedMemoryMB(); + + /** + * Set the allocated memory in MB + * + * @param allocatedMemoryMB + * the allocate memory + */ + public abstract void setAllocatedMemoryMB(long allocatedMemoryMB); + + /** + * Get the pending memory in MB + * + * @return the pending memory + */ + public abstract long getPendingMemoryMB(); + + /** + * Set the pending memory in MB + * + * @param pendingMemoryMB + * the pending memory + */ + public abstract void setPendingMemoryMB(long pendingMemoryMB); + + /** + * Get the reserved memory in MB + * + * @return the reserved memory + */ + public abstract long getReservedMemoryMB(); + + /** + * Set the reserved memory in MB + * + * @param reservedMemoryMB + * the reserved memory + */ + public abstract void setReservedMemoryMB(long reservedMemoryMB); + + /** + * Get the available vcores + * + * @return the available vcores + */ + public abstract long getAvailableVCores(); + + /** + * Set the available vcores + * + * @param availableVCores + * the available vcores + */ + public abstract void setAvailableVCores(long availableVCores); + + /** + * Get the allocated vcores + * + * @return the allocated vcores + */ + public abstract long getAllocatedVCores(); + + /** + * Set the allocated vcores + * + * @param allocatedVCores + * the allocated vcores + */ + public abstract void setAllocatedVCores(long allocatedVCores); + + /** + * Get the pending vcores + * + * @return the pending vcores + */ + public abstract long getPendingVCores(); + + /** + * Set the pending vcores + * + * @param pendingVCores + * the pending vcores + */ + public abstract void setPendingVCores(long pendingVCores); + + /** + * Get the reserved vcores + * + * @return the reserved vcores + */ + public abstract long getReservedVCores(); + + /** + * Set the reserved vcores + * + * @param reservedVCores + * the reserved vcores + */ + public abstract void setReservedVCores(long reservedVCores); +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/YarnClusterMetrics.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/YarnClusterMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/YarnClusterMetrics.java index 6610fdc..fc3edf7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/YarnClusterMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/YarnClusterMetrics.java @@ -53,4 +53,70 @@ public abstract class YarnClusterMetrics { @Unstable public abstract void setNumNodeManagers(int numNodeManagers); + /** + * Get the number of DecommissionedNodeManagers in the cluster. + * + * @return number of DecommissionedNodeManagers in the cluster + */ + @Public + @Unstable + public abstract int getNumDecommissionedNodeManagers(); + + @Private + @Unstable + public abstract void setNumDecommissionedNodeManagers( + int numDecommissionedNodeManagers); + + /** + * Get the number of ActiveNodeManagers in the cluster. + * + * @return number of ActiveNodeManagers in the cluster + */ + @Public + @Unstable + public abstract int getNumActiveNodeManagers(); + + @Private + @Unstable + public abstract void setNumActiveNodeManagers(int numActiveNodeManagers); + + /** + * Get the number of LostNodeManagers in the cluster. + * + * @return number of LostNodeManagers in the cluster + */ + @Public + @Unstable + public abstract int getNumLostNodeManagers(); + + @Private + @Unstable + public abstract void setNumLostNodeManagers(int numLostNodeManagers); + + /** + * Get the number of UnhealthyNodeManagers in the cluster. + * + * @return number of UnhealthyNodeManagers in the cluster + */ + @Public + @Unstable + public abstract int getNumUnhealthyNodeManagers(); + + @Private + @Unstable + public abstract void setNumUnhealthyNodeManagers(int numUnhealthNodeManagers); + + /** + * Get the number of RebootedNodeManagers in the cluster. + * + * @return number of RebootedNodeManagers in the cluster + */ + @Public + @Unstable + public abstract int getNumRebootedNodeManagers(); + + @Private + @Unstable + public abstract void setNumRebootedNodeManagers(int numRebootedNodeManagers); + } http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto index b396f4d..7781d65 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto @@ -339,6 +339,11 @@ message ApplicationACLMapProto { message YarnClusterMetricsProto { optional int32 num_node_managers = 1; + optional int32 num_decommissioned_nms = 2; + optional int32 num_active_nms = 3; + optional int32 num_lost_nms = 4; + optional int32 num_unhealthy_nms = 5; + optional int32 num_rebooted_nms = 6; } enum QueueStateProto { @@ -346,6 +351,24 @@ enum QueueStateProto { Q_RUNNING = 2; } +message QueueStatisticsProto { + optional int64 numAppsSubmitted = 1; + optional int64 numAppsRunning = 2; + optional int64 numAppsPending = 3; + optional int64 numAppsCompleted = 4; + optional int64 numAppsKilled = 5; + optional int64 numAppsFailed = 6; + optional int64 numActiveUsers = 7; + optional int64 availableMemoryMB = 8; + optional int64 allocatedMemoryMB = 9; + optional int64 pendingMemoryMB = 10; + optional int64 reservedMemoryMB = 11; + optional int64 availableVCores = 12; + optional int64 allocatedVCores = 13; + optional int64 pendingVCores = 14; + optional int64 reservedVCores = 15; +} + message QueueInfoProto { optional string queueName = 1; optional float capacity = 2; @@ -356,6 +379,7 @@ message QueueInfoProto { repeated ApplicationReportProto applications = 7; repeated string accessibleNodeLabels = 8; optional string defaultNodeLabelExpression = 9; + optional QueueStatisticsProto queueStatistics = 10; } enum QueueACLProto { http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/YarnClient.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/YarnClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/YarnClient.java index f617731..aa49d86 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/YarnClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/YarnClient.java @@ -237,7 +237,7 @@ public abstract class YarnClient extends AbstractService { * {@link #getApplicationReport(ApplicationId)}. *

* - * @param applicationTypes + * @param applicationTypes set of application types you are interested in * @return a list of reports of applications * @throws YarnException * @throws IOException @@ -257,7 +257,7 @@ public abstract class YarnClient extends AbstractService { * {@link #getApplicationReport(ApplicationId)}. *

* - * @param applicationStates + * @param applicationStates set of application states you are interested in * @return a list of reports of applications * @throws YarnException * @throws IOException @@ -278,8 +278,8 @@ public abstract class YarnClient extends AbstractService { * {@link #getApplicationReport(ApplicationId)}. *

* - * @param applicationTypes - * @param applicationStates + * @param applicationTypes set of application types you are interested in + * @param applicationStates set of application states you are interested in * @return a list of reports of applications * @throws YarnException * @throws IOException @@ -291,6 +291,32 @@ public abstract class YarnClient extends AbstractService { /** *

+ * Get a report (ApplicationReport) of Applications matching the given users, + * queues, application types and application states in the cluster. If any of + * the params is set to null, it is not used when filtering. + *

+ * + *

+ * If the user does not have VIEW_APP access for an application + * then the corresponding report will be filtered as described in + * {@link #getApplicationReport(ApplicationId)}. + *

+ * + * @param queues set of queues you are interested in + * @param users set of users you are interested in + * @param applicationTypes set of application types you are interested in + * @param applicationStates set of application states you are interested in + * @return a list of reports of applications + * @throws YarnException + * @throws IOException + */ + public abstract List getApplications(Set queues, + Set users, Set applicationTypes, + EnumSet applicationStates) throws YarnException, + IOException; + + /** + *

* Get metrics ({@link YarnClusterMetrics}) about the cluster. *

* @@ -426,7 +452,7 @@ public abstract class YarnClient extends AbstractService { * Get a report of all (ApplicationAttempts) of Application in the cluster. *

* - * @param applicationId + * @param applicationId application id of the app * @return a list of reports for all application attempts for specified * application. * @throws YarnException @@ -460,7 +486,7 @@ public abstract class YarnClient extends AbstractService { * Get a report of all (Containers) of ApplicationAttempt in the cluster. *

* - * @param applicationAttemptId + * @param applicationAttemptId application attempt id * @return a list of reports of all containers for specified application * attempts * @throws YarnException http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java index d6b36bb..5eda2c8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java @@ -485,6 +485,19 @@ public class YarnClientImpl extends YarnClient { } @Override + public List getApplications(Set queues, + Set users, Set applicationTypes, + EnumSet applicationStates) throws YarnException, + IOException { + GetApplicationsRequest request = + GetApplicationsRequest.newInstance(applicationTypes, applicationStates); + request.setQueues(queues); + request.setUsers(users); + GetApplicationsResponse response = rmClient.getApplications(request); + return response.getApplicationList(); + } + + @Override public YarnClusterMetrics getYarnClusterMetrics() throws YarnException, IOException { GetClusterMetricsRequest request = http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/TopCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/TopCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/TopCLI.java new file mode 100644 index 0000000..2b7d7f3 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/TopCLI.java @@ -0,0 +1,1099 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.client.cli; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Scanner; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang.time.DurationFormatUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.util.Time; +import org.apache.hadoop.util.ToolRunner; +import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest; +import org.apache.hadoop.yarn.api.records.ApplicationReport; +import org.apache.hadoop.yarn.api.records.QueueInfo; +import org.apache.hadoop.yarn.api.records.QueueStatistics; +import org.apache.hadoop.yarn.api.records.YarnApplicationState; +import org.apache.hadoop.yarn.api.records.YarnClusterMetrics; +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.exceptions.YarnException; +import org.codehaus.jettison.json.JSONObject; + +public class TopCLI extends YarnCLI { + + private static final Log LOG = LogFactory.getLog(TopCLI.class); + private String CLEAR = "\u001b[2J"; + private String CLEAR_LINE = "\u001b[2K"; + private String SET_CURSOR_HOME = "\u001b[H"; + private String CHANGE_BACKGROUND = "\u001b[7m"; + private String RESET_BACKGROUND = "\u001b[0m"; + private String SET_CURSOR_LINE_6_COLUMN_0 = "\u001b[6;0f"; + + // guava cache for getapplications call + protected Cache> + applicationReportsCache = CacheBuilder.newBuilder().maximumSize(1000) + .expireAfterWrite(5, TimeUnit.SECONDS).build(); + + enum DisplayScreen { + TOP, HELP, SORT, FIELDS + } + + enum Columns { // in the order in which they should be displayed + APPID, USER, TYPE, QUEUE, PRIORITY, CONT, RCONT, VCORES, RVCORES, MEM, + RMEM, VCORESECS, MEMSECS, PROGRESS, TIME, NAME + } + + static class ColumnInformation { + String header; + String format; + boolean display; // should we show this field or not + String description; + String key; // key to press for sorting/toggling field + + public ColumnInformation(String header, String format, boolean display, + String description, String key) { + this.header = header; + this.format = format; + this.display = display; + this.description = description; + this.key = key; + } + } + + private static class ApplicationInformation { + final String appid; + final String user; + final String type; + final int priority; + final int usedContainers; + final int reservedContainers; + final long usedMemory; + final long reservedMemory; + final int usedVirtualCores; + final int reservedVirtualCores; + final int attempts; + final float progress; + final String state; + long runningTime; + final String time; + final String name; + final int nodes; + final String queue; + final long memorySeconds; + final long vcoreSeconds; + + final EnumMap displayStringsMap; + + ApplicationInformation(ApplicationReport appReport) { + displayStringsMap = new EnumMap<>(Columns.class); + appid = appReport.getApplicationId().toString(); + displayStringsMap.put(Columns.APPID, appid); + user = appReport.getUser(); + displayStringsMap.put(Columns.USER, user); + type = appReport.getApplicationType().toLowerCase(); + displayStringsMap.put(Columns.TYPE, type); + state = appReport.getYarnApplicationState().toString().toLowerCase(); + name = appReport.getName(); + displayStringsMap.put(Columns.NAME, name); + queue = appReport.getQueue(); + displayStringsMap.put(Columns.QUEUE, queue); + priority = 0; + usedContainers = + appReport.getApplicationResourceUsageReport().getNumUsedContainers(); + displayStringsMap.put(Columns.CONT, String.valueOf(usedContainers)); + reservedContainers = + appReport.getApplicationResourceUsageReport() + .getNumReservedContainers(); + displayStringsMap.put(Columns.RCONT, String.valueOf(reservedContainers)); + usedVirtualCores = + appReport.getApplicationResourceUsageReport().getUsedResources() + .getVirtualCores(); + displayStringsMap.put(Columns.VCORES, String.valueOf(usedVirtualCores)); + usedMemory = + appReport.getApplicationResourceUsageReport().getUsedResources() + .getMemory() / 1024; + displayStringsMap.put(Columns.MEM, String.valueOf(usedMemory) + "G"); + reservedVirtualCores = + appReport.getApplicationResourceUsageReport().getReservedResources() + .getVirtualCores(); + displayStringsMap.put(Columns.RVCORES, + String.valueOf(reservedVirtualCores)); + reservedMemory = + appReport.getApplicationResourceUsageReport().getReservedResources() + .getMemory() / 1024; + displayStringsMap.put(Columns.RMEM, String.valueOf(reservedMemory) + "G"); + attempts = appReport.getCurrentApplicationAttemptId().getAttemptId(); + nodes = 0; + runningTime = Time.now() - appReport.getStartTime(); + time = DurationFormatUtils.formatDuration(runningTime, "dd:HH:mm"); + displayStringsMap.put(Columns.TIME, String.valueOf(time)); + progress = appReport.getProgress() * 100; + displayStringsMap.put(Columns.PROGRESS, String.format("%.2f", progress)); + // store in GBSeconds + memorySeconds = + appReport.getApplicationResourceUsageReport().getMemorySeconds() / 1024; + displayStringsMap.put(Columns.MEMSECS, String.valueOf(memorySeconds)); + vcoreSeconds = + appReport.getApplicationResourceUsageReport().getVcoreSeconds(); + displayStringsMap.put(Columns.VCORESECS, String.valueOf(vcoreSeconds)); + } + } + + // all the sort comparators + + public static final Comparator AppIDComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return a1.appid.compareTo(a2.appid); + } + }; + public static final Comparator UserComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return a1.user.compareTo(a2.user); + } + }; + public static final Comparator AppTypeComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return a1.type.compareTo(a2.type); + } + }; + public static final Comparator QueueNameComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return a1.queue.compareTo(a2.queue); + } + }; + public static final Comparator UsedContainersComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return a1.usedContainers - a2.usedContainers; + } + }; + public static final Comparator ReservedContainersComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return a1.reservedContainers - a2.reservedContainers; + } + }; + public static final Comparator UsedMemoryComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return Long.valueOf(a1.usedMemory).compareTo(a2.usedMemory); + } + }; + public static final Comparator ReservedMemoryComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return Long.valueOf(a1.reservedMemory).compareTo(a2.reservedMemory); + } + }; + public static final Comparator UsedVCoresComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return a1.usedVirtualCores - a2.usedVirtualCores; + } + }; + public static final Comparator ReservedVCoresComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return a1.reservedVirtualCores - a2.reservedVirtualCores; + } + }; + public static final Comparator VCoreSecondsComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return Long.valueOf(a1.vcoreSeconds).compareTo(a2.vcoreSeconds); + } + }; + public static final Comparator MemorySecondsComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return Long.valueOf(a1.memorySeconds).compareTo(a2.memorySeconds); + } + }; + public static final Comparator ProgressComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return Float.compare(a1.progress, a2.progress); + } + }; + public static final Comparator RunningTimeComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return Long.valueOf(a1.runningTime).compareTo(a2.runningTime); + } + }; + public static final Comparator AppNameComparator = + new Comparator() { + @Override + public int + compare(ApplicationInformation a1, ApplicationInformation a2) { + return a1.name.compareTo(a2.name); + } + }; + + private static class NodesInformation { + int totalNodes; + int runningNodes; + int unhealthyNodes; + int decommissionedNodes; + int lostNodes; + int rebootedNodes; + } + + private static class QueueMetrics { + long appsSubmitted; + long appsRunning; + long appsPending; + long appsCompleted; + long appsKilled; + long appsFailed; + long activeUsers; + long availableMemoryGB; + long allocatedMemoryGB; + long pendingMemoryGB; + long reservedMemoryGB; + long availableVCores; + long allocatedVCores; + long pendingVCores; + long reservedVCores; + } + + private class KeyboardMonitor extends Thread { + + public void run() { + Scanner keyboard = new Scanner(System.in, "UTF-8"); + while (runKeyboardMonitor.get()) { + String in = keyboard.next(); + try { + if (displayScreen == DisplayScreen.SORT) { + handleSortScreenKeyPress(in); + } else if (displayScreen == DisplayScreen.TOP) { + handleTopScreenKeyPress(in); + } else if (displayScreen == DisplayScreen.FIELDS) { + handleFieldsScreenKeyPress(in); + } else { + handleHelpScreenKeyPress(); + } + } catch (Exception e) { + LOG.error("Caught exception", e); + } + } + } + } + + long refreshPeriod = 3 * 1000; + int terminalWidth = -1; + int terminalHeight = -1; + String appsHeader; + boolean ascendingSort; + long rmStartTime; + Comparator comparator; + Options opts; + CommandLine cliParser; + + Set queues; + Set users; + Set types; + + DisplayScreen displayScreen; + AtomicBoolean showingTopScreen; + AtomicBoolean runMainLoop; + AtomicBoolean runKeyboardMonitor; + final Object lock = new Object(); + + String currentSortField; + + Map keyFieldsMap; + List sortedKeys; + + Thread displayThread; + + final EnumMap columnInformationEnumMap; + + public TopCLI() throws IOException, InterruptedException { + super(); + queues = new HashSet<>(); + users = new HashSet<>(); + types = new HashSet<>(); + comparator = UsedContainersComparator; + ascendingSort = false; + displayScreen = DisplayScreen.TOP; + showingTopScreen = new AtomicBoolean(); + showingTopScreen.set(true); + currentSortField = "c"; + keyFieldsMap = new HashMap<>(); + runKeyboardMonitor = new AtomicBoolean(); + runMainLoop = new AtomicBoolean(); + runKeyboardMonitor.set(true); + runMainLoop.set(true); + displayThread = Thread.currentThread(); + columnInformationEnumMap = new EnumMap<>(Columns.class); + generateColumnInformationMap(); + generateKeyFieldsMap(); + sortedKeys = new ArrayList<>(keyFieldsMap.keySet()); + Collections.sort(sortedKeys); + setTerminalSequences(); + } + + public static void main(String[] args) throws Exception { + TopCLI topImp = new TopCLI(); + topImp.setSysOutPrintStream(System.out); + topImp.setSysErrPrintStream(System.err); + int res = ToolRunner.run(topImp, args); + topImp.stop(); + System.exit(res); + } + + @Override + public int run(String[] args) throws Exception { + try { + parseOptions(args); + if (cliParser.hasOption("help")) { + printUsage(); + return 0; + } + } catch (Exception e) { + LOG.error("Unable to parse options", e); + return 1; + } + setAppsHeader(); + + Thread keyboardMonitor = new KeyboardMonitor(); + keyboardMonitor.start(); + + rmStartTime = getRMStartTime(); + clearScreen(); + + while (runMainLoop.get()) { + if (displayScreen == DisplayScreen.TOP) { + showTopScreen(); + try { + Thread.sleep(refreshPeriod); + } catch (InterruptedException ie) { + break; + } + } else if (displayScreen == DisplayScreen.SORT) { + showSortScreen(); + Thread.sleep(100); + } else if (displayScreen == DisplayScreen.FIELDS) { + showFieldsScreen(); + Thread.sleep(100); + } + if (rmStartTime == -1) { + // we were unable to get it the first time, try again + rmStartTime = getRMStartTime(); + } + } + clearScreen(); + return 0; + } + + private void parseOptions(String[] args) throws ParseException, IOException, + InterruptedException { + + // Command line options + opts = new Options(); + opts.addOption("queues", true, + "Comma separated list of queues to restrict applications"); + opts.addOption("users", true, + "Comma separated list of users to restrict applications"); + opts.addOption("types", true, "Comma separated list of types to restrict" + + " applications, case sensitive(though the display is lower case)"); + opts.addOption("cols", true, "Number of columns on the terminal"); + opts.addOption("rows", true, "Number of rows on the terminal"); + opts.addOption("help", false, + "Print usage; for help while the tool is running press 'h' + Enter"); + opts.addOption("delay", true, + "The refresh delay(in seconds), default is 3 seconds"); + + cliParser = new GnuParser().parse(opts, args); + if (cliParser.hasOption("queues")) { + String clqueues = cliParser.getOptionValue("queues"); + String[] queuesArray = clqueues.split(","); + queues.addAll(Arrays.asList(queuesArray)); + } + + if (cliParser.hasOption("users")) { + String clusers = cliParser.getOptionValue("users"); + users.addAll(Arrays.asList(clusers.split(","))); + } + + if (cliParser.hasOption("types")) { + String cltypes = cliParser.getOptionValue("types"); + types.addAll(Arrays.asList(cltypes.split(","))); + } + + if (cliParser.hasOption("cols")) { + terminalWidth = Integer.parseInt(cliParser.getOptionValue("cols")); + } else { + setTerminalWidth(); + } + + if (cliParser.hasOption("rows")) { + terminalHeight = Integer.parseInt(cliParser.getOptionValue("rows")); + } else { + setTerminalHeight(); + } + + if (cliParser.hasOption("delay")) { + int delay = Integer.parseInt(cliParser.getOptionValue("delay")); + if (delay < 1) { + LOG.warn("Delay set too low, using default"); + } else { + refreshPeriod = delay * 1000; + } + } + } + + private void printUsage() { + new HelpFormatter().printHelp("yarn top", opts); + System.out.println(""); + System.out.println("'yarn top' is a tool to help cluster administrators" + + " understand cluster usage better."); + System.out.println("Some notes about the implementation:"); + System.out.println(" 1. Fetching information for all the apps is an" + + " expensive call for the RM."); + System.out.println(" To prevent a performance degradation, the results" + + " are cached for 5 seconds,"); + System.out.println(" irrespective of the delay value. Information about" + + " the NodeManager(s) and queue"); + System.out.println(" utilization stats are fetched at the specified" + + " delay interval. Once we have a"); + System.out.println(" better understanding of the performance impact," + + " this might change."); + System.out.println(" 2. Since the tool is implemented in Java, you must" + + " hit Enter for key presses to"); + System.out.println(" be processed."); + } + + private void setAppsHeader() { + List formattedStrings = new ArrayList<>(); + for (EnumMap.Entry entry : + columnInformationEnumMap.entrySet()) { + if (entry.getValue().display) { + formattedStrings.add(String.format(entry.getValue().format, + entry.getValue().header)); + } + } + appsHeader = StringUtils.join(formattedStrings.toArray(), " "); + if (appsHeader.length() > terminalWidth) { + appsHeader = + appsHeader.substring(0, terminalWidth + - System.lineSeparator().length()); + } else { + appsHeader += + StringUtils.repeat(" ", terminalWidth - appsHeader.length() + - System.lineSeparator().length()); + } + appsHeader += System.lineSeparator(); + } + + private void setTerminalWidth() throws IOException, InterruptedException { + if (terminalWidth != -1) { + return; + } + String[] command = { "tput", "cols" }; + String op = getCommandOutput(command).trim(); + try { + terminalWidth = Integer.parseInt(op); + } catch (NumberFormatException ne) { + LOG.warn("Couldn't determine terminal width, setting to 80", ne); + terminalWidth = 80; + } + } + + private void setTerminalHeight() throws IOException, InterruptedException { + if (terminalHeight != -1) { + return; + } + String[] command = { "tput", "lines" }; + String op = getCommandOutput(command).trim(); + try { + terminalHeight = Integer.parseInt(op); + } catch (NumberFormatException ne) { + LOG.warn("Couldn't determine terminal height, setting to 24", ne); + terminalHeight = 24; + } + } + + protected void setTerminalSequences() throws IOException, + InterruptedException { + String[] tput_cursor_home = { "tput", "cup", "0", "0" }; + String[] tput_clear = { "tput", "clear" }; + String[] tput_clear_line = { "tput", "el" }; + String[] tput_set_cursor_line_6_column_0 = { "tput", "cup", "5", "0" }; + String[] tput_change_background = { "tput", "smso" }; + String[] tput_reset_background = { "tput", "rmso" }; + SET_CURSOR_HOME = getCommandOutput(tput_cursor_home); + CLEAR = getCommandOutput(tput_clear); + CLEAR_LINE = getCommandOutput(tput_clear_line); + SET_CURSOR_LINE_6_COLUMN_0 = + getCommandOutput(tput_set_cursor_line_6_column_0); + CHANGE_BACKGROUND = getCommandOutput(tput_change_background); + RESET_BACKGROUND = getCommandOutput(tput_reset_background); + } + + private void generateColumnInformationMap() { + columnInformationEnumMap.put(Columns.APPID, new ColumnInformation( + "APPLICATIONID", "%31s", true, "Application Id", "a")); + columnInformationEnumMap.put(Columns.USER, new ColumnInformation("USER", + "%-10s", true, "Username", "u")); + columnInformationEnumMap.put(Columns.TYPE, new ColumnInformation("TYPE", + "%10s", true, "Application type", "t")); + columnInformationEnumMap.put(Columns.QUEUE, new ColumnInformation("QUEUE", + "%10s", true, "Application queue", "q")); + columnInformationEnumMap.put(Columns.CONT, new ColumnInformation("#CONT", + "%7s", true, "Number of containers", "c")); + columnInformationEnumMap.put(Columns.RCONT, new ColumnInformation("#RCONT", + "%7s", true, "Number of reserved containers", "r")); + columnInformationEnumMap.put(Columns.VCORES, new ColumnInformation( + "VCORES", "%7s", true, "Allocated vcores", "v")); + columnInformationEnumMap.put(Columns.RVCORES, new ColumnInformation( + "RVCORES", "%7s", true, "Reserved vcores", "o")); + columnInformationEnumMap.put(Columns.MEM, new ColumnInformation("MEM", + "%7s", true, "Allocated memory", "m")); + columnInformationEnumMap.put(Columns.RMEM, new ColumnInformation("RMEM", + "%7s", true, "Reserved memory", "w")); + columnInformationEnumMap.put(Columns.VCORESECS, new ColumnInformation( + "VCORESECS", "%10s", true, "Vcore seconds", "s")); + columnInformationEnumMap.put(Columns.MEMSECS, new ColumnInformation( + "MEMSECS", "%10s", true, "Memory seconds(in GBseconds)", "y")); + columnInformationEnumMap.put(Columns.PROGRESS, new ColumnInformation( + "%PROGR", "%6s", true, "Progress(percentage)", "p")); + columnInformationEnumMap.put(Columns.TIME, new ColumnInformation("TIME", + "%10s", true, "Running time", "i")); + columnInformationEnumMap.put(Columns.NAME, new ColumnInformation("NAME", + "%s", true, "Application name", "n")); + } + + private void generateKeyFieldsMap() { + for (EnumMap.Entry entry : + columnInformationEnumMap.entrySet()) { + keyFieldsMap.put(entry.getValue().key, entry.getKey()); + } + } + + protected NodesInformation getNodesInfo() { + NodesInformation nodeInfo = new NodesInformation(); + YarnClusterMetrics yarnClusterMetrics; + try { + yarnClusterMetrics = client.getYarnClusterMetrics(); + } catch (IOException ie) { + LOG.error("Unable to fetch cluster metrics", ie); + return nodeInfo; + } catch (YarnException ye) { + LOG.error("Unable to fetch cluster metrics", ye); + return nodeInfo; + } + + nodeInfo.decommissionedNodes = + yarnClusterMetrics.getNumDecommissionedNodeManagers(); + nodeInfo.totalNodes = yarnClusterMetrics.getNumNodeManagers(); + nodeInfo.runningNodes = yarnClusterMetrics.getNumActiveNodeManagers(); + nodeInfo.lostNodes = yarnClusterMetrics.getNumLostNodeManagers(); + nodeInfo.unhealthyNodes = yarnClusterMetrics.getNumUnhealthyNodeManagers(); + nodeInfo.rebootedNodes = yarnClusterMetrics.getNumRebootedNodeManagers(); + return nodeInfo; + } + + protected QueueMetrics getQueueMetrics() { + QueueMetrics queueMetrics = new QueueMetrics(); + List queuesInfo; + if (queues.isEmpty()) { + try { + queuesInfo = client.getRootQueueInfos(); + } catch (Exception ie) { + LOG.error("Unable to get queue information", ie); + return queueMetrics; + } + } else { + queuesInfo = new ArrayList<>(); + for (String queueName : queues) { + try { + QueueInfo qInfo = client.getQueueInfo(queueName); + queuesInfo.add(qInfo); + } catch (Exception ie) { + LOG.error("Unable to get queue information", ie); + return queueMetrics; + } + } + } + + for (QueueInfo childInfo : queuesInfo) { + QueueStatistics stats = childInfo.getQueueStatistics(); + if (stats != null) { + queueMetrics.appsSubmitted += stats.getNumAppsSubmitted(); + queueMetrics.appsRunning += stats.getNumAppsRunning(); + queueMetrics.appsPending += stats.getNumAppsPending(); + queueMetrics.appsCompleted += stats.getNumAppsCompleted(); + queueMetrics.appsKilled += stats.getNumAppsKilled(); + queueMetrics.appsFailed += stats.getNumAppsFailed(); + queueMetrics.activeUsers += stats.getNumActiveUsers(); + queueMetrics.availableMemoryGB += stats.getAvailableMemoryMB(); + queueMetrics.allocatedMemoryGB += stats.getAllocatedMemoryMB(); + queueMetrics.pendingMemoryGB += stats.getPendingMemoryMB(); + queueMetrics.reservedMemoryGB += stats.getReservedMemoryMB(); + queueMetrics.availableVCores += stats.getAvailableVCores(); + queueMetrics.allocatedVCores += stats.getAllocatedVCores(); + queueMetrics.pendingVCores += stats.getPendingVCores(); + queueMetrics.reservedVCores += stats.getReservedVCores(); + } + } + queueMetrics.availableMemoryGB = queueMetrics.availableMemoryGB / 1024; + queueMetrics.allocatedMemoryGB = queueMetrics.allocatedMemoryGB / 1024; + queueMetrics.pendingMemoryGB = queueMetrics.pendingMemoryGB / 1024; + queueMetrics.reservedMemoryGB = queueMetrics.reservedMemoryGB / 1024; + return queueMetrics; + } + + long getRMStartTime() { + try { + URL url = + new URL("http://" + + client.getConfig().get(YarnConfiguration.RM_WEBAPP_ADDRESS) + + "/ws/v1/cluster/info"); + URLConnection conn = url.openConnection(); + conn.connect(); + InputStream in = conn.getInputStream(); + String encoding = conn.getContentEncoding(); + encoding = encoding == null ? "UTF-8" : encoding; + String body = IOUtils.toString(in, encoding); + JSONObject obj = new JSONObject(body); + JSONObject clusterInfo = obj.getJSONObject("clusterInfo"); + return clusterInfo.getLong("startedOn"); + } catch (Exception e) { + LOG.error("Could not fetch RM start time", e); + } + return -1; + } + + String getHeader(QueueMetrics queueMetrics, NodesInformation nodes) { + StringBuilder ret = new StringBuilder(); + String queue = "root"; + if (!queues.isEmpty()) { + queue = StringUtils.join(queues, ","); + } + long now = Time.now(); + long uptime = now - rmStartTime; + long days = TimeUnit.MILLISECONDS.toDays(uptime); + long hours = + TimeUnit.MILLISECONDS.toHours(uptime) + - TimeUnit.DAYS.toHours(TimeUnit.MILLISECONDS.toDays(uptime)); + long minutes = + TimeUnit.MILLISECONDS.toMinutes(uptime) + - TimeUnit.HOURS.toMinutes(TimeUnit.MILLISECONDS.toHours(uptime)); + String uptimeStr = String.format("%dd, %d:%d", days, hours, minutes); + String currentTime = DateFormatUtils.ISO_TIME_NO_T_FORMAT.format(now); + + ret.append(CLEAR_LINE); + ret.append(limitLineLength(String.format( + "YARN top - %s, up %s, %d active users, queue(s): %s%n", currentTime, + uptimeStr, queueMetrics.activeUsers, queue), terminalWidth, true)); + + ret.append(CLEAR_LINE); + ret.append(limitLineLength(String.format( + "NodeManager(s): %d total, %d active, %d unhealthy, %d decommissioned," + + " %d lost, %d rebooted%n", nodes.totalNodes, nodes.runningNodes, + nodes.unhealthyNodes, nodes.decommissionedNodes, nodes.lostNodes, + nodes.rebootedNodes), terminalWidth, true)); + + ret.append(CLEAR_LINE); + ret.append(limitLineLength(String.format( + "Queue(s) Applications: %d running, %d submitted, %d pending," + + " %d completed, %d killed, %d failed%n", queueMetrics.appsRunning, + queueMetrics.appsSubmitted, queueMetrics.appsPending, + queueMetrics.appsCompleted, queueMetrics.appsKilled, + queueMetrics.appsFailed), terminalWidth, true)); + + ret.append(CLEAR_LINE); + ret.append(limitLineLength(String.format("Queue(s) Mem(GB): %d available," + + " %d allocated, %d pending, %d reserved%n", + queueMetrics.availableMemoryGB, queueMetrics.allocatedMemoryGB, + queueMetrics.pendingMemoryGB, queueMetrics.reservedMemoryGB), + terminalWidth, true)); + + ret.append(CLEAR_LINE); + ret.append(limitLineLength(String.format("Queue(s) VCores: %d available," + + " %d allocated, %d pending, %d reserved%n", + queueMetrics.availableVCores, queueMetrics.allocatedVCores, + queueMetrics.pendingVCores, queueMetrics.reservedVCores), terminalWidth, + true)); + return ret.toString(); + } + + String getPrintableAppInformation(List appsInfo) { + StringBuilder ret = new StringBuilder(); + int limit = terminalHeight - 8; + List columns = new ArrayList<>(); + for (int i = 0; i < limit; ++i) { + ret.append(CLEAR_LINE); + if(i < appsInfo.size()) { + ApplicationInformation appInfo = appsInfo.get(i); + columns.clear(); + for (EnumMap.Entry entry : + columnInformationEnumMap.entrySet()) { + if (entry.getValue().display) { + String value = ""; + if (appInfo.displayStringsMap.containsKey(entry.getKey())) { + value = appInfo.displayStringsMap.get(entry.getKey()); + } + columns.add(String.format(entry.getValue().format, value)); + } + } + ret.append(limitLineLength( + (StringUtils.join(columns.toArray(), " ") + System.lineSeparator()), + terminalWidth, true)); + } + else { + ret.append(System.lineSeparator()); + } + } + return ret.toString(); + } + + protected void clearScreen() { + System.out.print(CLEAR); + System.out.flush(); + } + + protected void clearScreenWithoutScroll() { + System.out.print(SET_CURSOR_HOME); + for(int i = 0; i < terminalHeight; ++i) { + System.out.println(CLEAR_LINE); + } + } + + protected void printHeader(String header) { + System.out.print(SET_CURSOR_HOME); + System.out.print(header); + System.out.println(""); + } + + protected void printApps(String appInfo) { + System.out.print(CLEAR_LINE); + System.out.print(CHANGE_BACKGROUND + appsHeader + RESET_BACKGROUND); + System.out.print(appInfo); + } + + private void showHelpScreen() { + synchronized (lock) { + if (!showingTopScreen.get()) { + // we've already printed the help screen + return; + } + showingTopScreen.set(false); + clearScreenWithoutScroll(); + System.out.print(SET_CURSOR_HOME); + System.out.println("Help for yarn top."); + System.out.println("Delay: " + (refreshPeriod / 1000) + + " secs; Secure mode: " + UserGroupInformation.isSecurityEnabled()); + System.out.println(""); + System.out.println(" s + Enter: Select sort field"); + System.out.println(" f + Enter: Select fields to display"); + System.out.println(" R + Enter: Reverse current sort order"); + System.out.println(" h + Enter: Display this screen"); + System.out.println(" q + Enter: Quit"); + System.out.println(""); + System.out.println("Press any key followed by Enter to continue"); + } + } + + private void showSortScreen() { + synchronized (lock) { + showingTopScreen.set(false); + System.out.print(SET_CURSOR_HOME); + System.out.println(CLEAR_LINE + "Current Sort Field: " + currentSortField); + System.out.println(CLEAR_LINE + "Select sort field via letter followed by" + + " Enter, type any other key followed by Enter to return"); + System.out.println(CLEAR_LINE); + for (String key : sortedKeys) { + String prefix = " "; + if (key.equals(currentSortField)) { + prefix = "*"; + } + ColumnInformation value = + columnInformationEnumMap.get(keyFieldsMap.get(key)); + System.out.print(CLEAR_LINE); + System.out.println(String.format("%s %s: %-15s = %s", prefix, key, + value.header, value.description)); + } + } + } + + protected void showFieldsScreen() { + synchronized (lock) { + showingTopScreen.set(false); + System.out.print(SET_CURSOR_HOME); + System.out.println(CLEAR_LINE + "Current Fields: "); + System.out.println(CLEAR_LINE + "Toggle fields via field letter followed" + + " by Enter, type any other key followed by Enter to return"); + for (String key : sortedKeys) { + ColumnInformation info = + columnInformationEnumMap.get(keyFieldsMap.get(key)); + String prefix = " "; + String letter = key; + if (info.display) { + prefix = "*"; + letter = key.toUpperCase(); + } + System.out.print(CLEAR_LINE); + System.out.println(String.format("%s %s: %-15s = %s", prefix, letter, + info.header, info.description)); + } + } + } + + protected void showTopScreen() { + List appsInfo = new ArrayList<>(); + List apps; + try { + apps = fetchAppReports(); + } catch (Exception e) { + LOG.error("Unable to get application information", e); + return; + } + + for (ApplicationReport appReport : apps) { + ApplicationInformation appInfo = new ApplicationInformation(appReport); + appsInfo.add(appInfo); + } + if (ascendingSort) { + Collections.sort(appsInfo, comparator); + } else { + Collections.sort(appsInfo, Collections.reverseOrder(comparator)); + } + NodesInformation nodesInfo = getNodesInfo(); + QueueMetrics queueMetrics = getQueueMetrics(); + String header = getHeader(queueMetrics, nodesInfo); + String appsStr = getPrintableAppInformation(appsInfo); + synchronized (lock) { + printHeader(header); + printApps(appsStr); + System.out.print(SET_CURSOR_LINE_6_COLUMN_0); + System.out.print(CLEAR_LINE); + } + } + + private void handleSortScreenKeyPress(String input) { + String f = currentSortField; + currentSortField = input.toLowerCase(); + switch (input.toLowerCase()) { + case "a": + comparator = AppIDComparator; + break; + case "u": + comparator = UserComparator; + break; + case "t": + comparator = AppTypeComparator; + break; + case "q": + comparator = QueueNameComparator; + break; + case "c": + comparator = UsedContainersComparator; + break; + case "r": + comparator = ReservedContainersComparator; + break; + case "v": + comparator = UsedVCoresComparator; + break; + case "o": + comparator = ReservedVCoresComparator; + break; + case "m": + comparator = UsedMemoryComparator; + break; + case "w": + comparator = ReservedMemoryComparator; + break; + case "s": + comparator = VCoreSecondsComparator; + break; + case "y": + comparator = MemorySecondsComparator; + break; + case "p": + comparator = ProgressComparator; + break; + case "i": + comparator = RunningTimeComparator; + break; + case "n": + comparator = AppNameComparator; + break; + default: + // it wasn't a sort key + currentSortField = f; + showTopScreen(); + showingTopScreen.set(true); + displayScreen = DisplayScreen.TOP; + } + } + + private void handleFieldsScreenKeyPress(String input) { + if (keyFieldsMap.containsKey(input.toLowerCase())) { + toggleColumn(keyFieldsMap.get(input.toLowerCase())); + setAppsHeader(); + } else { + showTopScreen(); + showingTopScreen.set(true); + displayScreen = DisplayScreen.TOP; + } + } + + private void handleTopScreenKeyPress(String input) { + switch (input.toLowerCase()) { + case "q": + runMainLoop.set(false); + runKeyboardMonitor.set(false); + // wake up if it's sleeping + displayThread.interrupt(); + break; + case "s": + displayScreen = DisplayScreen.SORT; + showSortScreen(); + break; + case "f": + displayScreen = DisplayScreen.FIELDS; + showFieldsScreen(); + break; + case "r": + ascendingSort = !ascendingSort; + break; + case "h": + displayScreen = DisplayScreen.HELP; + showHelpScreen(); + break; + default: + break; + } + } + + private void handleHelpScreenKeyPress() { + showTopScreen(); + showingTopScreen.set(true); + displayScreen = DisplayScreen.TOP; + } + + String limitLineLength(String line, int length, boolean addNewline) { + if (line.length() > length) { + String tmp; + if (addNewline) { + tmp = line.substring(0, length - System.lineSeparator().length()); + tmp += System.lineSeparator(); + } else { + tmp = line.substring(0, length); + } + return tmp; + } + return line; + } + + void toggleColumn(Columns col) { + columnInformationEnumMap.get(col).display = + !columnInformationEnumMap.get(col).display; + } + + protected List fetchAppReports() throws YarnException, + IOException { + List ret; + EnumSet states = + EnumSet.of(YarnApplicationState.ACCEPTED, YarnApplicationState.RUNNING); + GetApplicationsRequest req = + GetApplicationsRequest.newInstance(types, states); + req.setQueues(queues); + req.setUsers(users); + ret = applicationReportsCache.getIfPresent(req); + if (ret != null) { + return ret; + } + ret = client.getApplications(queues, users, types, states); + applicationReportsCache.put(req, ret); + return ret; + } + + private String getCommandOutput(String[] command) throws IOException, + InterruptedException { + Process p = Runtime.getRuntime().exec(command); + p.waitFor(); + byte[] output = IOUtils.toByteArray(p.getInputStream()); + return new String(output, "ASCII"); + } +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java index f468bc1..509b470 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java @@ -685,7 +685,7 @@ public abstract class ProtocolHATestBase extends ClientBaseWithFixes { public QueueInfo createFakeQueueInfo() { return QueueInfo.newInstance("root", 100f, 100f, 50f, null, - createFakeAppReports(), QueueState.RUNNING, null, null); + createFakeAppReports(), QueueState.RUNNING, null, null, null); } public List createFakeQueueUserACLInfoList() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java index 4b60c52..b8be88d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java @@ -1268,7 +1268,7 @@ public class TestYarnCLI { nodeLabels.add("GPU"); nodeLabels.add("JDK_7"); QueueInfo queueInfo = QueueInfo.newInstance("queueA", 0.4f, 0.8f, 0.5f, - null, null, QueueState.RUNNING, nodeLabels, "GPU"); + null, null, QueueState.RUNNING, nodeLabels, "GPU", null); when(client.getQueueInfo(any(String.class))).thenReturn(queueInfo); int result = cli.run(new String[] { "-status", "queueA" }); assertEquals(0, result); @@ -1292,7 +1292,7 @@ public class TestYarnCLI { public void testGetQueueInfoWithEmptyNodeLabel() throws Exception { QueueCLI cli = createAndGetQueueCLI(); QueueInfo queueInfo = QueueInfo.newInstance("queueA", 0.4f, 0.8f, 0.5f, - null, null, QueueState.RUNNING, null, null); + null, null, QueueState.RUNNING, null, null, null); when(client.getQueueInfo(any(String.class))).thenReturn(queueInfo); int result = cli.run(new String[] { "-status", "queueA" }); assertEquals(0, result); http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java index 4b83500..4f12da2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java @@ -29,10 +29,12 @@ import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.records.ApplicationReport; import org.apache.hadoop.yarn.api.records.QueueInfo; import org.apache.hadoop.yarn.api.records.QueueState; +import org.apache.hadoop.yarn.api.records.QueueStatistics; import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationReportProto; import org.apache.hadoop.yarn.proto.YarnProtos.QueueInfoProto; import org.apache.hadoop.yarn.proto.YarnProtos.QueueInfoProtoOrBuilder; import org.apache.hadoop.yarn.proto.YarnProtos.QueueStateProto; +import org.apache.hadoop.yarn.proto.YarnProtos.QueueStatisticsProto; import com.google.protobuf.TextFormat; @@ -368,4 +370,29 @@ public class QueueInfoPBImpl extends QueueInfo { } builder.setDefaultNodeLabelExpression(defaultNodeLabelExpression); } + + private QueueStatistics convertFromProtoFormat(QueueStatisticsProto q) { + return new QueueStatisticsPBImpl(q); + } + + private QueueStatisticsProto convertToProtoFormat(QueueStatistics q) { + return ((QueueStatisticsPBImpl) q).getProto(); + } + + @Override + public QueueStatistics getQueueStatistics() { + QueueInfoProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasQueueStatistics()) ? convertFromProtoFormat(p + .getQueueStatistics()) : null; + } + + @Override + public void setQueueStatistics(QueueStatistics queueStatistics) { + maybeInitBuilder(); + if (queueStatistics == null) { + builder.clearQueueStatistics(); + return; + } + builder.setQueueStatistics(convertToProtoFormat(queueStatistics)); + } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueStatisticsPBImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueStatisticsPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueStatisticsPBImpl.java new file mode 100644 index 0000000..9506a5f --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueStatisticsPBImpl.java @@ -0,0 +1,257 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.api.records.impl.pb; + +import com.google.protobuf.TextFormat; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; +import org.apache.hadoop.yarn.api.records.QueueStatistics; +import org.apache.hadoop.yarn.proto.YarnProtos.QueueStatisticsProto; +import org.apache.hadoop.yarn.proto.YarnProtos.QueueStatisticsProtoOrBuilder; + +@InterfaceAudience.Private +@InterfaceStability.Unstable +public class QueueStatisticsPBImpl extends QueueStatistics { + + QueueStatisticsProto proto = QueueStatisticsProto.getDefaultInstance(); + QueueStatisticsProto.Builder builder = null; + boolean viaProto = false; + + public QueueStatisticsPBImpl() { + builder = QueueStatisticsProto.newBuilder(); + } + + public QueueStatisticsPBImpl(QueueStatisticsProto proto) { + this.proto = proto; + viaProto = true; + } + + public QueueStatisticsProto getProto() { + proto = viaProto ? proto : builder.build(); + viaProto = true; + return proto; + } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return TextFormat.shortDebugString(getProto()); + } + + private void maybeInitBuilder() { + if (viaProto || builder == null) { + builder = QueueStatisticsProto.newBuilder(proto); + } + viaProto = false; + } + + @Override + public long getNumAppsSubmitted() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasNumAppsSubmitted()) ? p.getNumAppsSubmitted() : -1; + } + + @Override + public void setNumAppsSubmitted(long numAppsSubmitted) { + maybeInitBuilder(); + builder.setNumAppsSubmitted(numAppsSubmitted); + } + + @Override + public long getNumAppsRunning() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasNumAppsRunning()) ? p.getNumAppsRunning() : -1; + } + + @Override + public void setNumAppsRunning(long numAppsRunning) { + maybeInitBuilder(); + builder.setNumAppsRunning(numAppsRunning); + } + + @Override + public long getNumAppsPending() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasNumAppsPending()) ? p.getNumAppsPending() : -1; + } + + @Override + public void setNumAppsPending(long numAppsPending) { + maybeInitBuilder(); + builder.setNumAppsPending(numAppsPending); + } + + @Override + public long getNumAppsCompleted() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasNumAppsCompleted()) ? p.getNumAppsCompleted() : -1; + } + + @Override + public void setNumAppsCompleted(long numAppsCompleted) { + maybeInitBuilder(); + builder.setNumAppsCompleted(numAppsCompleted); + } + + @Override + public long getNumAppsKilled() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasNumAppsKilled()) ? p.getNumAppsKilled() : -1; + } + + @Override + public void setNumAppsKilled(long numAppsKilled) { + maybeInitBuilder(); + builder.setNumAppsKilled(numAppsKilled); + } + + @Override + public long getNumAppsFailed() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasNumAppsFailed()) ? p.getNumAppsFailed() : -1; + } + + @Override + public void setNumAppsFailed(long numAppsFailed) { + maybeInitBuilder(); + builder.setNumAppsFailed(numAppsFailed); + } + + @Override + public long getNumActiveUsers() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasNumActiveUsers()) ? p.getNumActiveUsers() : -1; + } + + @Override + public void setNumActiveUsers(long numActiveUsers) { + maybeInitBuilder(); + builder.setNumActiveUsers(numActiveUsers); + } + + @Override + public long getAvailableMemoryMB() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasAvailableMemoryMB()) ? p.getAvailableMemoryMB() : -1; + } + + @Override + public void setAvailableMemoryMB(long availableMemoryMB) { + maybeInitBuilder(); + builder.setAvailableMemoryMB(availableMemoryMB); + } + + @Override + public long getAllocatedMemoryMB() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasAllocatedMemoryMB()) ? p.getAllocatedMemoryMB() : -1; + } + + @Override + public void setAllocatedMemoryMB(long allocatedMemoryMB) { + maybeInitBuilder(); + builder.setAllocatedMemoryMB(allocatedMemoryMB); + } + + @Override + public long getPendingMemoryMB() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasPendingMemoryMB()) ? p.getPendingMemoryMB() : -1; + } + + @Override + public void setPendingMemoryMB(long pendingMemoryMB) { + maybeInitBuilder(); + builder.setPendingMemoryMB(pendingMemoryMB); + } + + @Override + public long getReservedMemoryMB() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasReservedMemoryMB()) ? p.getReservedMemoryMB() : -1; + } + + @Override + public void setReservedMemoryMB(long reservedMemoryMB) { + maybeInitBuilder(); + builder.setReservedMemoryMB(reservedMemoryMB); + } + + @Override + public long getAvailableVCores() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasAvailableVCores()) ? p.getAvailableVCores() : -1; + } + + @Override + public void setAvailableVCores(long availableVCores) { + maybeInitBuilder(); + builder.setAvailableVCores(availableVCores); + } + + @Override + public long getAllocatedVCores() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasAllocatedVCores()) ? p.getAllocatedVCores() : -1; + } + + @Override + public void setAllocatedVCores(long allocatedVCores) { + maybeInitBuilder(); + builder.setAllocatedVCores(allocatedVCores); + } + + @Override + public long getPendingVCores() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasPendingVCores()) ? p.getPendingVCores() : -1; + } + + @Override + public void setPendingVCores(long pendingVCores) { + maybeInitBuilder(); + builder.setPendingVCores(pendingVCores); + } + + @Override + public long getReservedVCores() { + QueueStatisticsProtoOrBuilder p = viaProto ? proto : builder; + return (p.hasReservedVCores()) ? p.getReservedVCores() : -1; + } + + @Override + public void setReservedVCores(long reservedVCores) { + maybeInitBuilder(); + builder.setReservedVCores(reservedVCores); + } +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/YarnClusterMetricsPBImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/YarnClusterMetricsPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/YarnClusterMetricsPBImpl.java index ce2f748..1977517 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/YarnClusterMetricsPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/YarnClusterMetricsPBImpl.java @@ -89,6 +89,80 @@ public class YarnClusterMetricsPBImpl extends YarnClusterMetrics { builder.setNumNodeManagers((numNodeManagers)); } + @Override + public int getNumDecommissionedNodeManagers() { + YarnClusterMetricsProtoOrBuilder p = viaProto ? proto : builder; + if (p.hasNumDecommissionedNms()) { + return (p.getNumDecommissionedNms()); + } + return 0; + } + + @Override + public void + setNumDecommissionedNodeManagers(int numDecommissionedNodeManagers) { + maybeInitBuilder(); + builder.setNumDecommissionedNms((numDecommissionedNodeManagers)); + } + + @Override + public int getNumActiveNodeManagers() { + YarnClusterMetricsProtoOrBuilder p = viaProto ? proto : builder; + if (p.hasNumActiveNms()) { + return (p.getNumActiveNms()); + } + return 0; + } + @Override + public void setNumActiveNodeManagers(int numActiveNodeManagers) { + maybeInitBuilder(); + builder.setNumActiveNms((numActiveNodeManagers)); + } -} + @Override + public int getNumLostNodeManagers() { + YarnClusterMetricsProtoOrBuilder p = viaProto ? proto : builder; + if (p.hasNumLostNms()) { + return (p.getNumLostNms()); + } + return 0; + } + + @Override + public void setNumLostNodeManagers(int numLostNodeManagers) { + maybeInitBuilder(); + builder.setNumLostNms((numLostNodeManagers)); + } + + @Override + public int getNumUnhealthyNodeManagers() { + YarnClusterMetricsProtoOrBuilder p = viaProto ? proto : builder; + if (p.hasNumUnhealthyNms()) { + return (p.getNumUnhealthyNms()); + } + return 0; + + } + + @Override + public void setNumUnhealthyNodeManagers(int numUnhealthyNodeManagers) { + maybeInitBuilder(); + builder.setNumUnhealthyNms((numUnhealthyNodeManagers)); + } + + @Override + public int getNumRebootedNodeManagers() { + YarnClusterMetricsProtoOrBuilder p = viaProto ? proto : builder; + if (p.hasNumRebootedNms()) { + return (p.getNumRebootedNms()); + } + return 0; + } + + @Override + public void setNumRebootedNodeManagers(int numRebootedNodeManagers) { + maybeInitBuilder(); + builder.setNumRebootedNms((numRebootedNodeManagers)); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java index 80299c0..0d51688 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java @@ -130,6 +130,7 @@ import org.apache.hadoop.yarn.api.records.PreemptionResourceRequest; import org.apache.hadoop.yarn.api.records.Priority; import org.apache.hadoop.yarn.api.records.QueueInfo; import org.apache.hadoop.yarn.api.records.QueueState; +import org.apache.hadoop.yarn.api.records.QueueStatistics; import org.apache.hadoop.yarn.api.records.QueueUserACLInfo; import org.apache.hadoop.yarn.api.records.ReservationDefinition; import org.apache.hadoop.yarn.api.records.ReservationId; @@ -482,7 +483,8 @@ public class TestPBImplRecords { // it is recursive(has sub queues) typeValueCache.put(QueueInfo.class, QueueInfo.newInstance("root", 1.0f, 1.0f, 0.1f, null, null, QueueState.RUNNING, ImmutableSet.of("x", "y"), - "x && y")); + "x && y", null)); + generateByNewInstance(QueueStatistics.class); generateByNewInstance(QueueUserACLInfo.class); generateByNewInstance(YarnClusterMetrics.class); // for reservation system http://git-wip-us.apache.org/repos/asf/hadoop/blob/577d755e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.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/ClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java index 21d70b4..428b9eb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java @@ -660,6 +660,13 @@ public class ClientRMService extends AbstractService implements YarnClusterMetrics ymetrics = recordFactory .newRecordInstance(YarnClusterMetrics.class); ymetrics.setNumNodeManagers(this.rmContext.getRMNodes().size()); + ClusterMetrics clusterMetrics = ClusterMetrics.getMetrics(); + ymetrics.setNumDecommissionedNodeManagers(clusterMetrics + .getNumDecommisionedNMs()); + ymetrics.setNumActiveNodeManagers(clusterMetrics.getNumActiveNMs()); + ymetrics.setNumLostNodeManagers(clusterMetrics.getNumLostNMs()); + ymetrics.setNumUnhealthyNodeManagers(clusterMetrics.getUnhealthyNMs()); + ymetrics.setNumRebootedNodeManagers(clusterMetrics.getNumRebootedNMs()); response.setClusterMetrics(ymetrics); return response; }