Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This reverts commit 1507d30bc1.

Conflicts:

	hadoop-yarn-project/CHANGES.txt
This commit is contained in:
Jason Lowe 2015-12-15 17:59:45 +00:00
parent 35a5b8929e
commit 97a20ff2c6
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/CHANGES.txt
View File

@ -46,8 +46,6 @@ Release 2.7.3 - UNRELEASED
YARN-4422. Generic AHS sometimes doesn't show started, node, or logs on App page YARN-4422. Generic AHS sometimes doesn't show started, node, or logs on App page
(Eric Payne via jeagles) (Eric Payne via jeagles)
YARN-4439. Clarify NMContainerStatus#toString method. (Jian He via xgong)
MAPREDUCE-6436. JobHistory cache issue. (Kai Sasaki via zxu) MAPREDUCE-6436. JobHistory cache issue. (Kai Sasaki via zxu)
Release 2.7.2 - UNRELEASED Release 2.7.2 - UNRELEASED

14
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
View File

@ -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.proto.YarnServerCommonServiceProtos.NMContainerStatusProtoOrBuilder;
import org.apache.hadoop.yarn.server.api.protocolrecords.NMContainerStatus; import org.apache.hadoop.yarn.server.api.protocolrecords.NMContainerStatus;
import com.google.protobuf.TextFormat;
public class NMContainerStatusPBImpl extends NMContainerStatus { public class NMContainerStatusPBImpl extends NMContainerStatus {
NMContainerStatusProto proto = NMContainerStatusProto NMContainerStatusProto proto = NMContainerStatusProto
@ -79,17 +81,7 @@ public class NMContainerStatusPBImpl extends NMContainerStatus {
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); return TextFormat.shortDebugString(getProto());
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 @Override