From 5ce3a77f3c00aeabcd791c3373dd3c8c25160ce2 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Sat, 25 Apr 2015 06:08:16 +0900 Subject: [PATCH] YARN-3444. Fix typo capabililty. Contributed by Gabor Liptak. --- hadoop-yarn-project/CHANGES.txt | 2 ++ .../yarn/applications/distributedshell/ApplicationMaster.java | 4 ++-- .../hadoop/yarn/applications/distributedshell/Client.java | 4 ++-- .../src/site/markdown/WritingYarnApplications.md | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 19e3e27cbb..9754c33acf 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -265,6 +265,8 @@ Release 2.8.0 - UNRELEASED YARN-3387. Previous AM's container completed status couldn't pass to current AM if AM and RM restarted during the same time. (sandflee via jianhe) + YARN-3444. Fix typo capabililty. (Gabor Liptak via aajisaka) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java index f5b3d0ab1d..b62c24cbd7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java @@ -577,10 +577,10 @@ public void run() throws YarnException, IOException, InterruptedException { // Dump out information about cluster capability as seen by the // resource manager int maxMem = response.getMaximumResourceCapability().getMemory(); - LOG.info("Max mem capabililty of resources in this cluster " + maxMem); + LOG.info("Max mem capability of resources in this cluster " + maxMem); int maxVCores = response.getMaximumResourceCapability().getVirtualCores(); - LOG.info("Max vcores capabililty of resources in this cluster " + maxVCores); + LOG.info("Max vcores capability of resources in this cluster " + maxVCores); // A resource ask cannot exceed the max. if (containerMemory > maxMem) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java index 0e9a4e4a49..5a90880ee8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java @@ -488,7 +488,7 @@ public boolean run() throws IOException, YarnException { // Memory ask has to be a multiple of min and less than max. // Dump out information about cluster capability as seen by the resource manager int maxMem = appResponse.getMaximumResourceCapability().getMemory(); - LOG.info("Max mem capabililty of resources in this cluster " + maxMem); + LOG.info("Max mem capability of resources in this cluster " + maxMem); // A resource ask cannot exceed the max. if (amMemory > maxMem) { @@ -499,7 +499,7 @@ public boolean run() throws IOException, YarnException { } int maxVCores = appResponse.getMaximumResourceCapability().getVirtualCores(); - LOG.info("Max virtual cores capabililty of resources in this cluster " + maxVCores); + LOG.info("Max virtual cores capability of resources in this cluster " + maxVCores); if (amVCores > maxVCores) { LOG.info("AM virtual cores specified above max threshold of cluster. " diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/WritingYarnApplications.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/WritingYarnApplications.md index 5e4df9f767..03b296488d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/WritingYarnApplications.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/WritingYarnApplications.md @@ -356,10 +356,10 @@ RegisterApplicationMasterResponse response = amRMClient // Dump out information about cluster capability as seen by the // resource manager int maxMem = response.getMaximumResourceCapability().getMemory(); -LOG.info("Max mem capabililty of resources in this cluster " + maxMem); +LOG.info("Max mem capability of resources in this cluster " + maxMem); int maxVCores = response.getMaximumResourceCapability().getVirtualCores(); -LOG.info("Max vcores capabililty of resources in this cluster " + maxVCores); +LOG.info("Max vcores capability of resources in this cluster " + maxVCores); // A resource ask cannot exceed the max. if (containerMemory > maxMem) {