[1/2] hadoop git commit: Revert "YARN-4439. Clarify NMContainerStatus#toString method. Contributed by"

[jlowe]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 35a5b8929 -> 8ab642989


Revert "YARN-4439. Clarify NMContainerStatus#toString method. Contributed by"

This reverts commit 1507d30bc126cac3f18a87de0936c2d0d0d1ccff.

Conflicts:

        hadoop-yarn-project/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/97a20ff2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/97a20ff2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/97a20ff2

Branch: refs/heads/branch-2.7
Commit: 97a20ff2c6ac0e9b2f78462d325ad83ccf84e85f
Parents: 35a5b89
Author: Jason Lowe <jl...@apache.org>
Authored: Tue Dec 15 17:59:45 2015 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Tue Dec 15 17:59:45 2015 +0000

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                       |  2 --
 .../impl/pb/NMContainerStatusPBImpl.java              | 14 +++-----------
 2 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/97a20ff2/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 2f935f3..8063080 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -46,8 +46,6 @@ 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)
-
     MAPREDUCE-6436. JobHistory cache issue. (Kai Sasaki via zxu)
 
 Release 2.7.2 - UNRELEASED

http://git-wip-us.apache.org/repos/asf/hadoop/blob/97a20ff2/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 997ff1d..86e1d97 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
@@ -34,6 +34,8 @@ 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
@@ -79,17 +81,7 @@ public class NMContainerStatusPBImpl extends 
NMContainerStatus {
 
   @Override
   public String toString() {
-    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();
+    return TextFormat.shortDebugString(getProto());
   }
 
   @Override