From ea05b4245b6eefc7b829bac25f169dd89e3aa6f4 Mon Sep 17 00:00:00 2001 From: Anu Engineer Date: Tue, 29 Aug 2017 14:05:28 -0700 Subject: [PATCH] HDFS-12333. Ozone: Extend Datanode web interface with SCM information. Contributed by Elek, Marton. --- .../impl/ContainerLocationManagerImpl.java | 11 ++++- .../ContainerLocationManagerMXBean.java | 36 +++++++++++++++ .../statemachine/EndpointStateMachine.java | 30 +++++++++++- .../EndpointStateMachineMBean.java | 34 ++++++++++++++ .../statemachine/SCMConnectionManager.java | 28 +++++++++-- .../SCMConnectionManagerMXBean.java | 27 +++++++++++ .../endpoint/HeartbeatEndpointTask.java | 2 + .../src/main/webapps/datanode/datanode.html | 46 +++++++++++++++++++ .../src/main/webapps/datanode/dn.js | 28 +++++++++-- .../src/main/webapps/static/dfs-dust.js | 5 +- 10 files changed, 235 insertions(+), 12 deletions(-) create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerLocationManagerMXBean.java create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachineMBean.java create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManagerMXBean.java diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java index 9a6ef2e22e7..b8424934368 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java @@ -21,12 +21,15 @@ package org.apache.hadoop.ozone.container.common.impl; import com.google.common.base.Preconditions; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.server.datanode.StorageLocation; +import org.apache.hadoop.metrics2.util.MBeans; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.container.common.interfaces .ContainerLocationManager; +import org.apache.hadoop.ozone.container.common.interfaces.ContainerLocationManagerMXBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.management.ObjectName; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; @@ -41,14 +44,15 @@ import java.util.List; * For example : A user could map all container files to a * SSD but leave data/metadata on bunch of other disks. */ -public class ContainerLocationManagerImpl implements ContainerLocationManager { +public class ContainerLocationManagerImpl implements ContainerLocationManager, + ContainerLocationManagerMXBean { private static final Logger LOG = LoggerFactory.getLogger(ContainerLocationManagerImpl.class); private final List dataLocations; private int currentIndex; private final List metadataLocations; - + private final ObjectName jmxbean; /** * Constructs a Location Manager. @@ -67,6 +71,8 @@ public class ContainerLocationManagerImpl implements ContainerLocationManager { dataLocations.add(new ContainerStorageLocation(dataDir, conf)); } this.metadataLocations = metadataLocations; + jmxbean = MBeans.register("OzoneDataNode", + ContainerLocationManager.class.getSimpleName(), this); } /** @@ -138,5 +144,6 @@ public class ContainerLocationManagerImpl implements ContainerLocationManager { for (ContainerStorageLocation loc: dataLocations) { loc.shutdown(); } + MBeans.unregister(jmxbean); } } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerLocationManagerMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerLocationManagerMXBean.java new file mode 100644 index 00000000000..88e6148630b --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerLocationManagerMXBean.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.ozone.container.common.interfaces; + +import org.apache.hadoop.ozone.container.common.impl.StorageLocationReport; + +import java.io.IOException; + +/** + * Returns physical path locations, where the containers will be created. + */ +public interface ContainerLocationManagerMXBean { + + /** + * Returns an array of storage location usage report. + * + * @return storage location usage report. + */ + StorageLocationReport[] getLocationReport() throws IOException; + +} diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java index 872412b6c5f..4f1f47f7e52 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java @@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory; import java.io.Closeable; import java.io.IOException; import java.net.InetSocketAddress; +import java.time.ZonedDateTime; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -35,7 +36,8 @@ import java.util.concurrent.locks.ReentrantLock; /** * Endpoint is used as holder class that keeps state around the RPC endpoint. */ -public class EndpointStateMachine implements Closeable { +public class EndpointStateMachine + implements Closeable, EndpointStateMachineMBean { static final Logger LOG = LoggerFactory.getLogger(EndpointStateMachine.class); private final StorageContainerDatanodeProtocolClientSideTranslatorPB endPoint; @@ -45,6 +47,7 @@ public class EndpointStateMachine implements Closeable { private final Configuration conf; private EndPointStates state; private VersionResponse version; + private ZonedDateTime lastSuccessfulHeartbeat; /** * Constructs RPC Endpoints. @@ -104,6 +107,15 @@ public class EndpointStateMachine implements Closeable { return state; } + @Override + public int getVersionNumber() { + if (version != null) { + return version.getProtobufMessage().getSoftwareVersion(); + } else { + return -1; + } + } + /** * Sets the endpoint state. * @@ -144,6 +156,11 @@ public class EndpointStateMachine implements Closeable { return this.missedCount.get(); } + @Override + public String getAddressString() { + return getAddress().toString(); + } + public void zeroMissedCount() { this.missedCount.set(0); } @@ -262,4 +279,15 @@ public class EndpointStateMachine implements Closeable { return getLastState(); } } + + public long getLastSuccessfulHeartbeat() { + return lastSuccessfulHeartbeat == null ? + 0 : + lastSuccessfulHeartbeat.toEpochSecond(); + } + + public void setLastSuccessfulHeartbeat( + ZonedDateTime lastSuccessfulHeartbeat) { + this.lastSuccessfulHeartbeat = lastSuccessfulHeartbeat; + } } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachineMBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachineMBean.java new file mode 100644 index 00000000000..4f64bde0b3e --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachineMBean.java @@ -0,0 +1,34 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.hadoop.ozone.container.common.statemachine; + + +/** + * JMX representation of an EndpointStateMachine. + */ +public interface EndpointStateMachineMBean { + + long getMissedCount(); + + String getAddressString(); + + EndpointStateMachine.EndPointStates getState(); + + int getVersionNumber(); + + long getLastSuccessfulHeartbeat(); +} diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManager.java index 963b6459dde..a6767c2add2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManager.java @@ -20,6 +20,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.ipc.ProtobufRpcEngine; import org.apache.hadoop.ipc.RPC; +import org.apache.hadoop.metrics2.util.MBeans; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.ozone.client.OzoneClientUtils; import org.apache.hadoop.ozone.protocolPB @@ -29,12 +30,11 @@ import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.management.ObjectName; import java.io.Closeable; import java.io.IOException; import java.net.InetSocketAddress; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; +import java.util.*; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -42,7 +42,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; * SCMConnectionManager - Acts as a class that manages the membership * information of the SCMs that we are working with. */ -public class SCMConnectionManager implements Closeable{ +public class SCMConnectionManager + implements Closeable, SCMConnectionManagerMXBean { private static final Logger LOG = LoggerFactory.getLogger(SCMConnectionManager.class); @@ -51,7 +52,7 @@ public class SCMConnectionManager implements Closeable{ private final int rpcTimeout; private final Configuration conf; - + private final ObjectName jmxBean; public SCMConnectionManager(Configuration conf) { this.mapLock = new ReentrantReadWriteLock(); @@ -59,8 +60,12 @@ public class SCMConnectionManager implements Closeable{ this.rpcTimeout = timeOut.intValue(); this.scmMachines = new HashMap<>(); this.conf = conf; + jmxBean = MBeans.register("OzoneDataNode", + "SCMConnectionManager", + this); } + /** * Returns Config. * @@ -179,5 +184,18 @@ public class SCMConnectionManager implements Closeable{ public void close() throws IOException { getValues().forEach(endpointStateMachine -> IOUtils.cleanupWithLogger(LOG, endpointStateMachine)); + MBeans.unregister(jmxBean); + } + + @Override + public List getSCMServers() { + readLock(); + try { + return Collections + .unmodifiableList(new ArrayList<>(scmMachines.values())); + + } finally { + readUnlock(); + } } } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManagerMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManagerMXBean.java new file mode 100644 index 00000000000..25ef16379a6 --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManagerMXBean.java @@ -0,0 +1,27 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.hadoop.ozone.container.common.statemachine; + +import java.util.List; + +/** + * JMX information about the connected SCM servers. + */ +public interface SCMConnectionManagerMXBean { + + List getSCMServers(); +} diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/HeartbeatEndpointTask.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/HeartbeatEndpointTask.java index d68351ce51c..49cc3a50a00 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/HeartbeatEndpointTask.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/HeartbeatEndpointTask.java @@ -40,6 +40,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; +import java.time.ZonedDateTime; import java.util.concurrent.Callable; /** @@ -103,6 +104,7 @@ public class HeartbeatEndpointTask .sendHeartbeat(datanodeID, this.context.getNodeReport(), this.context.getContainerReportState()); processResponse(reponse); + rpcEndpoint.setLastSuccessfulHeartbeat(ZonedDateTime.now()); rpcEndpoint.zeroMissedCount(); } catch (IOException ex) { rpcEndpoint.logIfNeeded(ex); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html index e474ab5f16b..28562654835 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html @@ -95,6 +95,52 @@ {/dn.BPServiceActorInfo} +{#ozone.enabled} +

Ozone: SCM Connections

+ + + + + + + + + + + {#ozone.SCMServers} + + + + + + + + {/ozone.SCMServers} +
SCM AddressStatusVersionMissed countLast heartbeat
{addressString}{state}{versionNumber}{missedCount}s{lastSuccessfulHeartbeat|elapsed|fmt_time}
+ +

Ozone: Storage locations

+ + + + + + + + + + + {#ozone.LocationReport} + + + + + + + + {/ozone.LocationReport} +
IDCapacityRemainingSCM usedfailed
{id}{capacity|fmt_bytes}{remaining|fmt_bytes}{scmUsed|fmt_bytes}{failed}
+{/ozone.enabled} +

Volume Information

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/dn.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/dn.js index 9e2732ca5de..3b671671de2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/dn.js +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/dn.js @@ -18,11 +18,11 @@ (function () { "use strict"; - var data = {}; + var data = {ozone: {enabled: false}}; dust.loadSource(dust.compile($('#tmpl-dn').html(), 'dn')); - function load() { + function loadDatanodeInfo() { $.get('/jmx?qry=Hadoop:service=DataNode,name=DataNodeInfo', function(resp) { data.dn = workaround(resp.beans[0]); data.dn.HostName = resp.beans[0]['DatanodeHostname']; @@ -30,6 +30,26 @@ }).fail(show_err_msg); } + function loadOzoneScmInfo() { + $.get('/jmx?qry=Hadoop:service=OzoneDataNode,name=SCMConnectionManager', function (resp) { + if (resp.beans.length > 0) { + data.ozone.SCMServers = resp.beans[0].SCMServers; + data.ozone.enabled = true; + render(); + } + }).fail(show_err_msg); + } + + function loadOzoneStorageInfo() { + $.get('/jmx?qry=Hadoop:service=OzoneDataNode,name=ContainerLocationManager', function (resp) { + if (resp.beans.length > 0) { + data.ozone.LocationReport = resp.beans[0].LocationReport; + data.ozone.enabled = true; + render(); + } + }).fail(show_err_msg); + } + function workaround(dn) { function node_map_to_array(nodes) { var res = []; @@ -65,6 +85,8 @@ $('#alert-panel').show(); } - load(); + loadDatanodeInfo(); + loadOzoneScmInfo(); + loadOzoneStorageInfo(); })(); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dfs-dust.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dfs-dust.js index 1f37d21fcaf..c7af6a18d3d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dfs-dust.js +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dfs-dust.js @@ -38,7 +38,10 @@ 'fmt_percentage': function (v) { return Math.round(v * 100) / 100 + '%'; }, - + 'elapsed': function(v) { + //elapsed sec from epoch sec + return Date.now() - v * 1000; + }, 'fmt_time': function (v) { var s = Math.floor(v / 1000), h = Math.floor(s / 3600); s -= h * 3600;