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

YARN-3965. Add startup timestamp to nodemanager UI. Contributed by Hong Zhiguo

This commit is contained in:
Jason Lowe 2015-08-03 15:53:32 +00:00
parent 3cd02b9522
commit 469cfcd695
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,6 +361,8 @@ Release 2.8.0 - UNRELEASED
YARN-3950. Add unique SHELL_ID environment variable to DistributedShell
(Robert Kanter via jlowe)
YARN-3965. Add startup timestamp to nodemanager UI (Hong Zhiguo via jlowe)
OPTIMIZATIONS
YARN-3339. TestDockerContainerExecutor should pull a single image and not

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
View File

@ -81,6 +81,7 @@ public class NodeManager extends CompositeService
public static final int SHUTDOWN_HOOK_PRIORITY = 30;
private static final Log LOG = LogFactory.getLog(NodeManager.class);
private static long nmStartupTime = System.currentTimeMillis();
protected final NodeManagerMetrics metrics = NodeManagerMetrics.create();
private ApplicationACLsManager aclsManager;
private NodeHealthCheckerService nodeHealthChecker;
@ -101,6 +102,10 @@ public class NodeManager extends CompositeService
super(NodeManager.class.getName());
}
public static long getNMStartupTime() {
return nmStartupTime;
}
protected NodeStatusUpdater createNodeStatusUpdater(Context context,
Dispatcher dispatcher, NodeHealthCheckerService healthChecker) {
return new NodeStatusUpdaterImpl(context, dispatcher, healthChecker,

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java
View File

@ -81,7 +81,9 @@ public class NodePage extends NMView {
info.getLastNodeUpdateTime()))
._("NodeHealthReport",
info.getHealthReport())
._("Node Manager Version:", info.getNMBuildVersion() +
._("NodeManager started on", new Date(
info.getNMStartupTime()))
._("NodeManager Version:", info.getNMBuildVersion() +
" on " + info.getNMVersionBuiltOn())
._("Hadoop Version:", info.getHadoopBuildVersion() +
" on " + info.getHadoopVersionBuiltOn());

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/dao/NodeInfo.java
View File

@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.hadoop.util.VersionInfo;
import org.apache.hadoop.yarn.server.nodemanager.Context;
import org.apache.hadoop.yarn.server.nodemanager.NodeManager;
import org.apache.hadoop.yarn.server.nodemanager.ResourceView;
import org.apache.hadoop.yarn.util.YarnVersionInfo;
@ -49,6 +50,7 @@ public class NodeInfo {
protected String hadoopVersionBuiltOn;
protected String id;
protected String nodeHostName;
protected long nmStartupTime;
public NodeInfo() {
} // JAXB needs this
@ -77,6 +79,7 @@ public class NodeInfo {
this.hadoopVersion = VersionInfo.getVersion();
this.hadoopBuildVersion = VersionInfo.getBuildVersion();
this.hadoopVersionBuiltOn = VersionInfo.getDate();
this.nmStartupTime = NodeManager.getNMStartupTime();
}
public String getNodeId() {
@ -143,4 +146,7 @@ public class NodeInfo {
return this.pmemCheckEnabled;
}
public long getNMStartupTime() {
return nmStartupTime;
}
}

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java
View File

@ -402,7 +402,7 @@ public class TestNMWebServices extends JerseyTestBase {
public void verifyNodeInfo(JSONObject json) throws JSONException, Exception {
assertEquals("incorrect number of elements", 1, json.length());
JSONObject info = json.getJSONObject("nodeInfo");
assertEquals("incorrect number of elements", 16, info.length());
assertEquals("incorrect number of elements", 17, info.length());
verifyNodeInfoGeneric(info.getString("id"), info.getString("healthReport"),
info.getLong("totalVmemAllocatedContainersMB"),
info.getLong("totalPmemAllocatedContainersMB"),