You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by av...@apache.org on 2020/10/30 20:14:38 UTC
[ozone] branch HDDS-3698-upgrade updated: HDDS-4142. Expose upgrade
related state through JMX. (#1534)
This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch HDDS-3698-upgrade
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-3698-upgrade by this push:
new 18bef92 HDDS-4142. Expose upgrade related state through JMX. (#1534)
18bef92 is described below
commit 18bef92f10be9823226b7b281be08c527469f3c3
Author: Ethan Rose <33...@users.noreply.github.com>
AuthorDate: Fri Oct 30 16:13:17 2020 -0400
HDDS-4142. Expose upgrade related state through JMX. (#1534)
---
.../upgrade/AbstractLayoutVersionManager.java | 6 +++++-
.../ozone/upgrade/LayoutVersionManagerMXBean.java | 25 ++++++++++++++++++++++
.../upgrade/TestAbstractLayoutVersionManager.java | 21 ++++++++++++++++++
3 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/AbstractLayoutVersionManager.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/AbstractLayoutVersionManager.java
index 456cf7f..831e6a1 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/AbstractLayoutVersionManager.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/AbstractLayoutVersionManager.java
@@ -30,13 +30,14 @@ import java.util.TreeMap;
import java.util.stream.Collectors;
import com.google.common.base.Preconditions;
+import org.apache.hadoop.metrics2.util.MBeans;
/**
* Layout Version Manager containing generic method implementations.
*/
@SuppressWarnings("visibilitymodifier")
public abstract class AbstractLayoutVersionManager<T extends LayoutFeature>
- implements LayoutVersionManager {
+ implements LayoutVersionManager, LayoutVersionManagerMXBean {
protected int metadataLayoutVersion; // MLV.
protected int softwareLayoutVersion; // SLV.
@@ -62,6 +63,9 @@ public abstract class AbstractLayoutVersionManager<T extends LayoutFeature>
currentUpgradeState = ALREADY_FINALIZED;
}
}
+
+ MBeans.register("LayoutVersionManager",
+ "AbstractLayoutVersionManager", this);
}
public UpgradeFinalizer.Status getUpgradeState() {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionManagerMXBean.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionManagerMXBean.java
new file mode 100644
index 0000000..143f5d2
--- /dev/null
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionManagerMXBean.java
@@ -0,0 +1,25 @@
+/*
+ * 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.upgrade;
+
+public interface LayoutVersionManagerMXBean {
+ int getMetadataLayoutVersion();
+
+ int getSoftwareLayoutVersion();
+}
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/upgrade/TestAbstractLayoutVersionManager.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/upgrade/TestAbstractLayoutVersionManager.java
index 1a786a2..e5c707f 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/upgrade/TestAbstractLayoutVersionManager.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/upgrade/TestAbstractLayoutVersionManager.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.lang.management.ManagementFactory;
import java.util.Iterator;
import org.junit.Rule;
@@ -33,6 +34,8 @@ import org.junit.runner.RunWith;
import org.mockito.Spy;
import org.mockito.junit.MockitoJUnitRunner;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
/**
* Test generic layout management init and APIs.
@@ -154,6 +157,24 @@ public class TestAbstractLayoutVersionManager {
assertFalse(versionManager.isAllowed(lfs[2]));
}
+ @Test
+ public void testJmx() throws Exception {
+ final int numLayoutFeatures = 3;
+ final int metadataLayoutVersion = 1;
+ versionManager.init(metadataLayoutVersion,
+ getTestLayoutFeatures(numLayoutFeatures));
+
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ ObjectName bean = new ObjectName(
+ "Hadoop:service=LayoutVersionManager," +
+ "name=AbstractLayoutVersionManager");
+
+ Object mlv = mbs.getAttribute(bean, "MetadataLayoutVersion");
+ assertEquals(metadataLayoutVersion, mlv);
+ Object slv = mbs.getAttribute(bean, "SoftwareLayoutVersion");
+ assertEquals(numLayoutFeatures, slv);
+ }
+
private LayoutFeature[] getTestLayoutFeatures(int num) {
LayoutFeature[] lfs = new LayoutFeature[num];
int k = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org