HDDS-707. Allow registering MBeans without additional jmx properties.

Contributed by Arpit Agarwal.

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java

@@ -21,22 +21,29 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Strings;
 import com.google.common.net.HostAndPort;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
 import org.apache.hadoop.hdds.scm.ScmConfigKeys;
+import org.apache.hadoop.metrics2.util.MBeans;
 import org.apache.hadoop.net.DNS;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.ozone.OzoneConfigKeys;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.management.ObjectName;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Map;
 
 import static org.apache.hadoop.hdfs.DFSConfigKeys
     .DFS_DATANODE_DNS_INTERFACE_KEY;
@@ -49,6 +56,8 @@
 /**
  * HDDS specific stateless utility functions.
  */
+@InterfaceAudience.Private
+@InterfaceStability.Stable
 public final class HddsUtils {
 
 
@@ -348,4 +357,38 @@ public static boolean isReadOnly(
     }
   }
 
+  /**
+   * Register the provided MBean with additional JMX ObjectName properties.
+   * If additional properties are not supported then fallback to registering
+   * without properties.
+   *
+   * @param serviceName - see {@link MBeans#register}
+   * @param mBeanName - see {@link MBeans#register}
+   * @param jmxProperties - additional JMX ObjectName properties.
+   * @param mBean - the MBean to register.
+   * @return the named used to register the MBean.
+   */
+  public static ObjectName registerWithJmxProperties(
+      String serviceName, String mBeanName, Map<String, String> jmxProperties,
+      Object mBean) {
+    try {
+
+      // Check support for registering with additional properties.
+      final Method registerMethod = MBeans.class.getMethod(
+          "register", String.class, String.class,
+          Map.class, Object.class);
+
+      return (ObjectName) registerMethod.invoke(
+          null, serviceName, mBeanName, jmxProperties, mBean);
+
+    } catch (NoSuchMethodException | IllegalAccessException |
+        InvocationTargetException e) {
+
+      // Fallback
+      LOG.trace("Registering MBean {} without additional properties {}",
+          mBeanName, jmxProperties);
+      return MBeans.register(serviceName, mBeanName, mBean);
+    }
+  }
+
 }

hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/RocksDBStore.java

@@ -21,6 +21,7 @@
 import com.google.common.base.Preconditions;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.hadoop.hdds.HddsUtils;
 import org.apache.hadoop.metrics2.util.MBeans;
 import org.apache.ratis.thirdparty.com.google.common.annotations.
     VisibleForTesting;
@@ -72,7 +73,8 @@ public RocksDBStore(File dbFile, Options options)
 
         Map<String, String> jmxProperties = new HashMap<String, String>();
         jmxProperties.put("dbName", dbFile.getName());
-        statMBeanName = MBeans.register("Ozone", "RocksDbStore", jmxProperties,
+        statMBeanName = HddsUtils.registerWithJmxProperties(
+            "Ozone", "RocksDbStore", jmxProperties,
             new RocksDBStoreMBean(dbOptions.statistics()));
         if (statMBeanName == null) {
           LOG.warn("jmx registration failed during RocksDB init, db path :{}",

hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBStore.java

@@ -20,6 +20,7 @@
 package org.apache.hadoop.utils.db;
 
 import com.google.common.base.Preconditions;
+import org.apache.hadoop.hdds.HddsUtils;
 import org.apache.hadoop.hdfs.DFSUtil;
 import org.apache.hadoop.metrics2.util.MBeans;
 import org.apache.hadoop.utils.RocksDBStoreMBean;
@@ -92,7 +93,8 @@ public RDBStore(File dbFile, DBOptions options, Set<TableConfig> families)
       if (dbOptions.statistics() != null) {
         Map<String, String> jmxProperties = new HashMap<>();
         jmxProperties.put("dbName", dbFile.getName());
-        statMBeanName = MBeans.register("Ozone", "RocksDbStore", jmxProperties,
+        statMBeanName = HddsUtils.registerWithJmxProperties(
+            "Ozone", "RocksDbStore", jmxProperties,
             new RocksDBStoreMBean(dbOptions.statistics()));
         if (statMBeanName == null) {
           LOG.warn("jmx registration failed during RocksDB init, db path :{}",

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java

@@ -611,10 +611,9 @@ public void onRemoval(
   }
 
   private void registerMXBean() {
-    Map<String, String> jmxProperties = new HashMap<>();
+    final Map<String, String> jmxProperties = new HashMap<>();
     jmxProperties.put("component", "ServerRuntime");
-    this.scmInfoBeanName =
+    this.scmInfoBeanName = HddsUtils.registerWithJmxProperties(
-        MBeans.register(
         "StorageContainerManager", "StorageContainerManagerInfo",
         jmxProperties, this);
   }

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java

@@ -21,6 +21,7 @@
 import com.google.common.base.Preconditions;
 import com.google.protobuf.BlockingService;
 import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.hdds.HddsUtils;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -1041,13 +1042,10 @@ public AuditMessage buildAuditMessageForFailure(AuditAction op,
   }
 
   private void registerMXBean() {
-    Map<String, String> jmxProperties = new HashMap<String, String>();
+    Map<String, String> jmxProperties = new HashMap<>();
     jmxProperties.put("component", "ServerRuntime");
-    this.omInfoBeanName =
+    this.omInfoBeanName = HddsUtils.registerWithJmxProperties(
-        MBeans.register("OzoneManager",
+        "OzoneManager", "OzoneManagerInfo", jmxProperties, this);
-            "OzoneManagerInfo",
-            jmxProperties,
-            this);
   }
 
   private void unregisterMXBean() {