From a2d73b185ff31c888fa36491fa721653464bb03b Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Fri, 22 Jan 2016 02:13:02 +0900 Subject: [PATCH] YARN-4608. Redundant code statement in WritingYarnApplications. Contributed by Kai Sasaki. (cherry picked from commit d3224e2d6274daf73a103c0dbe21ba69add7ca26) (cherry picked from commit 01cd6dce63f2ac21a52f6f2539cb222e895044eb) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../src/site/markdown/WritingYarnApplications.md | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 90a0d9bc671..918ebb32865 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1158,6 +1158,9 @@ Release 2.8.0 - UNRELEASED YARN-4557. Fix improper Queues sorting in PartitionedQueueComparator when accessible-node-labels=*. (Naganarasimha G R via wangda) + YARN-4608. Redundant code statement in WritingYarnApplications. + (Kai Sasaki via aajisaka) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES 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 d5a7a1791dc..1aaec18a5c6 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 @@ -208,7 +208,7 @@ if (debugFlag) { vargs.add("1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/AppMaster.stdout"); vargs.add("2>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/AppMaster.stderr"); -// Get final commmand +// Get final command StringBuilder command = new StringBuilder(); for (CharSequence str : vargs) { command.append(str).append(" "); @@ -339,7 +339,7 @@ ApplicationAttemptId appAttemptID = containerId.getApplicationAttemptId(); nmClientAsync.start(); ``` -* The AM has to emit heartbeats to the RM to keep it informed that the AM is alive and still running. The timeout expiry interval at the RM is defined by a config setting accessible via `YarnConfiguration.RM_AM_EXPIRY_INTERVAL_MS` with the default being defined by `YarnConfiguration.DEFAULT_RM_AM_EXPIRY_INTERVAL_MS`. The ApplicationMaster needs to register itself with the ResourceManager to start hearbeating. +* The AM has to emit heartbeats to the RM to keep it informed that the AM is alive and still running. The timeout expiry interval at the RM is defined by a config setting accessible via `YarnConfiguration.RM_AM_EXPIRY_INTERVAL_MS` with the default being defined by `YarnConfiguration.DEFAULT_RM_AM_EXPIRY_INTERVAL_MS`. The ApplicationMaster needs to register itself with the ResourceManager to start heartbeating. ```java // Register self with ResourceManager @@ -384,8 +384,6 @@ LOG.info("Received " + previousAMRunningContainers.size() * Based on the task requirements, the AM can ask for a set of containers to run its tasks on. We can now calculate how many containers we need, and request those many containers. ```java -List previousAMRunningContainers = - response.getContainersFromPreviousAttempts(); List previousAMRunningContainers = response.getContainersFromPreviousAttempts(); LOG.info("Received " + previousAMRunningContainers.size() @@ -486,7 +484,7 @@ vargs.add(shellArgs); vargs.add("1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stdout"); vargs.add("2>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stderr"); -// Get final commmand +// Get final command StringBuilder command = new StringBuilder(); for (CharSequence str : vargs) { command.append(str).append(" ");