You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ka...@apache.org on 2016/01/25 18:25:51 UTC
[16/50] [abbrv] hadoop git commit: YARN-4608. Redundant code
statement in WritingYarnApplications. Contributed by Kai Sasaki.
YARN-4608. Redundant code statement in WritingYarnApplications. Contributed by Kai Sasaki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3ac9511d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3ac9511d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3ac9511d
Branch: refs/heads/YARN-1011
Commit: 3ac9511da2c0ac815d96713aec099fa87daef648
Parents: 4992398
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Jan 22 02:13:02 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri Jan 22 02:14:31 2016 +0900
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../src/site/markdown/WritingYarnApplications.md | 8 +++-----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ac9511d/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 4cbf1a8..ca89b32 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1295,6 +1295,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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ac9511d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/WritingYarnApplications.md
----------------------------------------------------------------------
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 d5a7a17..1aaec18 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
@@ -386,8 +386,6 @@ LOG.info("Received " + previousAMRunningContainers.size()
```java
List<Container> previousAMRunningContainers =
response.getContainersFromPreviousAttempts();
-List<Container> previousAMRunningContainers =
- response.getContainersFromPreviousAttempts();
LOG.info("Received " + previousAMRunningContainers.size()
+ " previous AM's running containers on AM registration.");
@@ -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(" ");