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

HDFS-16444. Show start time of JournalNode on Web (#3943)

This commit is contained in:
litao 2022-01-30 16:13:58 +08:00 committed by GitHub
parent 39cad5f28f
commit bd50b9117e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
View File

@ -45,6 +45,7 @@ import org.apache.hadoop.util.DiskChecker;
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_JOURNALNODE_HTTP_BIND_HOST_KEY; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_JOURNALNODE_HTTP_BIND_HOST_KEY;
import static org.apache.hadoop.util.ExitUtil.terminate; import static org.apache.hadoop.util.ExitUtil.terminate;
import static org.apache.hadoop.util.Time.now;
import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner; import org.apache.hadoop.util.ToolRunner;
@ -83,6 +84,7 @@ public class JournalNode implements Tool, Configurable, JournalNodeMXBean {
private String httpServerURI; private String httpServerURI;
private final ArrayList<File> localDir = Lists.newArrayList(); private final ArrayList<File> localDir = Lists.newArrayList();
Tracer tracer; Tracer tracer;
private long startTime = 0;
static { static {
HdfsConfiguration.init(); HdfsConfiguration.init();
@ -241,6 +243,7 @@ public class JournalNode implements Tool, Configurable, JournalNodeMXBean {
rpcServer = new JournalNodeRpcServer(conf, this); rpcServer = new JournalNodeRpcServer(conf, this);
rpcServer.start(); rpcServer.start();
startTime = now();
} catch (IOException ioe) { } catch (IOException ioe) {
//Shutdown JournalNode of JournalNodeRpcServer fails to start //Shutdown JournalNode of JournalNodeRpcServer fails to start
LOG.error("Failed to start JournalNode.", ioe); LOG.error("Failed to start JournalNode.", ioe);
@ -415,6 +418,11 @@ public class JournalNode implements Tool, Configurable, JournalNodeMXBean {
return VersionInfo.getVersion() + ", r" + VersionInfo.getRevision(); return VersionInfo.getVersion() + ", r" + VersionInfo.getRevision();
} }
@Override // JournalNodeMXBean
public long getJNStartedTimeInMillis() {
return this.startTime;
}
/** /**
* Register JournalNodeMXBean * Register JournalNodeMXBean
*/ */

7
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeMXBean.java
View File

@ -57,4 +57,11 @@ public interface JournalNodeMXBean {
* @return the version of Hadoop. * @return the version of Hadoop.
*/ */
String getVersion(); String getVersion();
/**
* Get the start time of the JournalNode.
*
* @return the start time of the JournalNode.
*/
long getJNStartedTimeInMillis();
} }

1
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/journalnode.html
View File

@ -71,6 +71,7 @@
<div class="page-header"><h1>JournalNode on <small>{HostAndPort}</small></h1></div> <div class="page-header"><h1>JournalNode on <small>{HostAndPort}</small></h1></div>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<tr><th>Cluster ID:</th><td>{ClusterIds}</td></tr> <tr><th>Cluster ID:</th><td>{ClusterIds}</td></tr>
<tr><th>Started:</th><td>{JNStartedTimeInMillis|date_tostring}</td></tr>
<tr><th>Version:</th><td>{Version}</td></tr> <tr><th>Version:</th><td>{Version}</td></tr>
</table> </table>
{/jn} {/jn}

3
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java
View File

@ -104,6 +104,9 @@ public class TestJournalNodeMXBean {
String[] clusterId = (String[]) mbs.getAttribute(mxbeanName, "ClusterIds"); String[] clusterId = (String[]) mbs.getAttribute(mxbeanName, "ClusterIds");
assertEquals(jn.getClusterIds().size(), clusterId.length); assertEquals(jn.getClusterIds().size(), clusterId.length);
assertEquals("mycluster", clusterId[0]); assertEquals("mycluster", clusterId[0]);
long startTime = (long) mbs.getAttribute(mxbeanName, "JNStartedTimeInMillis");
assertTrue("JournalNode start time should not be 0", startTime > 0);
assertEquals(jn.getJNStartedTimeInMillis(), startTime);
String version = (String) mbs.getAttribute(mxbeanName, "Version"); String version = (String) mbs.getAttribute(mxbeanName, "Version");
assertEquals(jn.getVersion(), version); assertEquals(jn.getVersion(), version);