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 xg...@apache.org on 2015/12/15 00:41:52 UTC
hadoop git commit: YARN-4439. Clarify NMContainerStatus#toString
method. Contributed by Jian He
Repository: hadoop
Updated Branches:
refs/heads/trunk 915cd6c3f -> d8a45425e
YARN-4439. Clarify NMContainerStatus#toString method. Contributed by
Jian He
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d8a45425
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d8a45425
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d8a45425
Branch: refs/heads/trunk
Commit: d8a45425eba372cdebef3be50436b6ddf1c4e192
Parents: 915cd6c
Author: Xuan <xg...@apache.org>
Authored: Mon Dec 14 15:41:28 2015 -0800
Committer: Xuan <xg...@apache.org>
Committed: Mon Dec 14 15:41:28 2015 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 2 ++
.../impl/pb/NMContainerStatusPBImpl.java | 14 +++++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d8a45425/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index ed4fc59..886ac7c 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1181,6 +1181,8 @@ Release 2.7.3 - UNRELEASED
YARN-4422. Generic AHS sometimes doesn't show started, node, or logs on App page
(Eric Payne via jeagles)
+ YARN-4439. Clarify NMContainerStatus#toString method. (Jian He via xgong)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d8a45425/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/NMContainerStatusPBImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/NMContainerStatusPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/NMContainerStatusPBImpl.java
index 624b89b..921c9d9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/NMContainerStatusPBImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/NMContainerStatusPBImpl.java
@@ -35,8 +35,6 @@ import org.apache.hadoop.yarn.proto.YarnServerCommonServiceProtos.NMContainerSta
import org.apache.hadoop.yarn.proto.YarnServerCommonServiceProtos.NMContainerStatusProtoOrBuilder;
import org.apache.hadoop.yarn.server.api.protocolrecords.NMContainerStatus;
-import com.google.protobuf.TextFormat;
-
public class NMContainerStatusPBImpl extends NMContainerStatus {
NMContainerStatusProto proto = NMContainerStatusProto
@@ -82,7 +80,17 @@ public class NMContainerStatusPBImpl extends NMContainerStatus {
@Override
public String toString() {
- return TextFormat.shortDebugString(getProto());
+ StringBuilder sb = new StringBuilder();
+ sb.append("[").append(getContainerId()).append(", ")
+ .append("CreateTime: ").append(getCreationTime()).append(", ")
+ .append("State: ").append(getContainerState()).append(", ")
+ .append("Capability: ").append(getAllocatedResource()).append(", ")
+ .append("Diagnostics: ").append(getDiagnostics()).append(", ")
+ .append("ExitStatus: ").append(getContainerExitStatus()).append(", ")
+ .append("NodeLabelExpression: ").append(getNodeLabelExpression())
+ .append("Priority: ").append(getPriority())
+ .append("]");
+ return sb.toString();
}
@Override