This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 6d4d423814 HDDS-13181. Added metrics for internal Snapshot Operations.
(#8606)
6d4d423814 is described below
commit 6d4d423814dfd2af64612209b5a7a16f8f01abee
Author: SaketaChalamchala <[email protected]>
AuthorDate: Thu Jun 12 20:33:55 2025 -0700
HDDS-13181. Added metrics for internal Snapshot Operations. (#8606)
---
.../java/org/apache/hadoop/ozone/om/OMMetrics.java | 36 -------
.../hadoop/ozone/om/OmSnapshotInternalMetrics.java | 118 +++++++++++++++++++++
.../org/apache/hadoop/ozone/om/OzoneManager.java | 6 ++
.../snapshot/OMSnapshotMoveTableKeysRequest.java | 5 +
.../request/snapshot/OMSnapshotPurgeRequest.java | 8 +-
.../snapshot/OMSnapshotSetPropertyRequest.java | 8 +-
.../TestOMSnapshotMoveTableKeysRequest.java | 16 +++
.../TestOMSnapshotPurgeRequestAndResponse.java | 16 +--
...estOMSnapshotSetPropertyRequestAndResponse.java | 16 +--
.../snapshot/TestSnapshotRequestAndResponse.java | 9 ++
10 files changed, 178 insertions(+), 60 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
index f69b9c4986..1fb49e5e7f 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
@@ -74,8 +74,6 @@ public class OMMetrics implements OmMetadataReaderMetrics {
private @Metric MutableCounterLong numSnapshotRenames;
private @Metric MutableCounterLong numSnapshotDiffJobs;
private @Metric MutableCounterLong numSnapshotInfos;
- private @Metric MutableCounterLong numSnapshotPurges;
- private @Metric MutableCounterLong numSnapshotSetProperties;
private @Metric MutableCounterLong numCancelSnapshotDiffs;
private @Metric MutableCounterLong numListSnapshotDiffJobs;
@@ -146,8 +144,6 @@ public class OMMetrics implements OmMetadataReaderMetrics {
private @Metric MutableCounterLong numSnapshotListFails;
private @Metric MutableCounterLong numSnapshotDiffJobFails;
private @Metric MutableCounterLong numSnapshotInfoFails;
- private @Metric MutableCounterLong numSnapshotPurgeFails;
- private @Metric MutableCounterLong numSnapshotSetPropertyFails;
private @Metric MutableCounterLong numCancelSnapshotDiffFails;
private @Metric MutableCounterLong numListSnapshotDiffJobFails;
@@ -507,14 +503,6 @@ public void incNumSnapshotInfos() {
numSnapshotInfos.incr();
}
- public void incNumSnapshotPurges() {
- numSnapshotPurges.incr();
- }
-
- public void incNumSnapshotSetProperties() {
- numSnapshotSetProperties.incr();
- }
-
public void incNumSnapshotDiffJobs() {
numSnapshotDiffJobs.incr();
}
@@ -547,14 +535,6 @@ public void incNumSnapshotInfoFails() {
numSnapshotInfoFails.incr();
}
- public void incNumSnapshotPurgeFails() {
- numSnapshotPurgeFails.incr();
- }
-
- public void incNumSnapshotSetPropertyFails() {
- numSnapshotSetPropertyFails.incr();
- }
-
public void setNumSnapshotActive(long num) {
long currVal = numSnapshotActive.value();
numSnapshotActive.incr(num - currVal);
@@ -1384,14 +1364,6 @@ public long getNumSnapshotDiffJobs() {
return numSnapshotDiffJobs.value();
}
- public long getNumSnapshotPurges() {
- return numSnapshotPurges.value();
- }
-
- public long getNumSnapshotSetProperties() {
- return numSnapshotSetProperties.value();
- }
-
public long getNumSnapshotCreateFails() {
return numSnapshotCreateFails.value();
}
@@ -1416,14 +1388,6 @@ public long getNumSnapshotDeleted() {
return numSnapshotDeleted.value();
}
- public long getNumSnapshotPurgeFails() {
- return numSnapshotPurgeFails.value();
- }
-
- public long getNumSnapshotSetPropertyFails() {
- return numSnapshotSetPropertyFails.value();
- }
-
public void incNumTrashRenames() {
numTrashRenames.incr();
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotInternalMetrics.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotInternalMetrics.java
new file mode 100644
index 0000000000..ce5896c1b9
--- /dev/null
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotInternalMetrics.java
@@ -0,0 +1,118 @@
+/*
+ * 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.om;
+
+import org.apache.hadoop.metrics2.annotation.Metric;
+import org.apache.hadoop.metrics2.annotation.Metrics;
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+import org.apache.hadoop.metrics2.lib.MetricsRegistry;
+import org.apache.hadoop.metrics2.lib.MutableCounterLong;
+import org.apache.hadoop.ozone.OzoneConsts;
+
+/**
+ * This class contains internal Snapshot Operation metrics.
+ */
+@Metrics(about = "Snapshot Internal Operation Metrics", context =
OzoneConsts.OZONE)
+public class OmSnapshotInternalMetrics {
+
+ public static final String METRICS_SOURCE_NAME =
+ OmSnapshotInternalMetrics.class.getSimpleName();
+ private MetricsRegistry registry;
+
+ /*
+ * Total internal snapshot deletion operation metrics since last restart.
+ */
+ @Metric("Total no. of snapshots purged")
+ private MutableCounterLong numSnapshotPurges;
+ @Metric("Total no. of snapshot set properties")
+ private MutableCounterLong numSnapshotSetProperties;
+ @Metric("Total no. of move table keys requests")
+ private MutableCounterLong numSnapshotMoveTableKeys;
+
+ @Metric("Total no. of snapshot purge failures")
+ private MutableCounterLong numSnapshotPurgeFails;
+ @Metric("Total no. of snapshot set property failures")
+ private MutableCounterLong numSnapshotSetPropertyFails;
+ @Metric("Total no. of snapshot move table keys failures")
+ private MutableCounterLong numSnapshotMoveTableKeysFails;
+
+ public OmSnapshotInternalMetrics() {
+ this.registry = new MetricsRegistry(METRICS_SOURCE_NAME);
+ }
+
+ public static OmSnapshotInternalMetrics create() {
+ return DefaultMetricsSystem.instance().register(METRICS_SOURCE_NAME,
+ "Metrics tracking the progress of snapshot internal operations",
+ new OmSnapshotInternalMetrics());
+ }
+
+ /**
+ * Unregister the metrics instance.
+ */
+ public static void unregister() {
+ DefaultMetricsSystem.instance().unregisterSource(METRICS_SOURCE_NAME);
+ }
+
+ public void incNumSnapshotPurges() {
+ numSnapshotPurges.incr();
+ }
+
+ public void incNumSnapshotSetProperties() {
+ numSnapshotSetProperties.incr();
+ }
+
+ public void incNumSnapshotMoveTableKeys() {
+ numSnapshotMoveTableKeys.incr();
+ }
+
+ public void incNumSnapshotPurgeFails() {
+ numSnapshotPurgeFails.incr();
+ }
+
+ public void incNumSnapshotSetPropertyFails() {
+ numSnapshotSetPropertyFails.incr();
+ }
+
+ public void incNumSnapshotMoveTableKeysFails() {
+ numSnapshotMoveTableKeysFails.incr();
+ }
+
+ public long getNumSnapshotPurges() {
+ return numSnapshotPurges.value();
+ }
+
+ public long getNumSnapshotSetProperties() {
+ return numSnapshotSetProperties.value();
+ }
+
+ public long getNumSnapshotMoveTableKeys() {
+ return numSnapshotMoveTableKeys.value();
+ }
+
+ public long getNumSnapshotPurgeFails() {
+ return numSnapshotPurgeFails.value();
+ }
+
+ public long getNumSnapshotSetPropertyFails() {
+ return numSnapshotSetPropertyFails.value();
+ }
+
+ public long getNumSnapshotMoveTableKeysFails() {
+ return numSnapshotMoveTableKeysFails.value();
+ }
+}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 44ac2c9bf5..25dd832e3d 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -406,6 +406,7 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
private final OzoneAdmins s3OzoneAdmins;
private final OMMetrics metrics;
+ private final OmSnapshotInternalMetrics omSnapshotIntMetrics;
private OMHAMetrics omhaMetrics;
private final ProtocolMessageMetrics<ProtocolMessageEnum>
omClientProtocolMetrics;
@@ -668,6 +669,7 @@ private OzoneManager(OzoneConfiguration conf, StartupOption
startupOption)
OMMultiTenantManager.checkAndEnableMultiTenancy(this, conf);
metrics = OMMetrics.create();
+ omSnapshotIntMetrics = OmSnapshotInternalMetrics.create();
perfMetrics = OMPerformanceMetrics.register();
omDeletionMetrics = DeletingServiceMetrics.create();
// Get admin list
@@ -1752,6 +1754,10 @@ public OMMetrics getMetrics() {
return metrics;
}
+ public OmSnapshotInternalMetrics getOmSnapshotIntMetrics() {
+ return omSnapshotIntMetrics;
+ }
+
public OMPerformanceMetrics getPerfMetrics() {
return perfMetrics;
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotMoveTableKeysRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotMoveTableKeysRequest.java
index 0ac0257c41..7348fe41b6 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotMoveTableKeysRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotMoveTableKeysRequest.java
@@ -30,6 +30,7 @@
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
+import org.apache.hadoop.ozone.om.OmSnapshotInternalMetrics;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.SnapshotChainManager;
import org.apache.hadoop.ozone.om.exceptions.OMException;
@@ -137,6 +138,8 @@ public OMRequest preExecute(OzoneManager ozoneManager)
throws IOException {
@Override
@DisallowedUntilLayoutVersion(FILESYSTEM_SNAPSHOT)
public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
ExecutionContext context) {
+ OmSnapshotInternalMetrics omSnapshotIntMetrics =
ozoneManager.getOmSnapshotIntMetrics();
+
OmMetadataManagerImpl omMetadataManager = (OmMetadataManagerImpl)
ozoneManager.getMetadataManager();
SnapshotChainManager snapshotChainManager =
omMetadataManager.getSnapshotChainManager();
@@ -168,8 +171,10 @@ public OMClientResponse
validateAndUpdateCache(OzoneManager ozoneManager, Execut
omClientResponse = new
OMSnapshotMoveTableKeysResponse(omResponse.build(), fromSnapshot, nextSnapshot,
moveTableKeysRequest.getDeletedKeysList(),
moveTableKeysRequest.getDeletedDirsList(),
moveTableKeysRequest.getRenamedKeysList());
+ omSnapshotIntMetrics.incNumSnapshotMoveTableKeys();
} catch (IOException ex) {
omClientResponse = new
OMSnapshotMoveTableKeysResponse(createErrorOMResponse(omResponse, ex));
+ omSnapshotIntMetrics.incNumSnapshotMoveTableKeysFails();
}
return omClientResponse;
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
index 5f08c52c1c..3dd2842ed3 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
@@ -27,8 +27,8 @@
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.om.OMMetadataManager;
-import org.apache.hadoop.ozone.om.OMMetrics;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
+import org.apache.hadoop.ozone.om.OmSnapshotInternalMetrics;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.SnapshotChainManager;
import org.apache.hadoop.ozone.om.execution.flowcontrol.ExecutionContext;
@@ -65,7 +65,7 @@ public OMSnapshotPurgeRequest(OMRequest omRequest) {
@Override
public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
ExecutionContext context) {
- OMMetrics omMetrics = ozoneManager.getMetrics();
+ OmSnapshotInternalMetrics omSnapshotIntMetrics =
ozoneManager.getOmSnapshotIntMetrics();
final long trxnLogIndex = context.getIndex();
@@ -122,13 +122,13 @@ public OMClientResponse
validateAndUpdateCache(OzoneManager ozoneManager, Execut
omClientResponse = new OMSnapshotPurgeResponse(omResponse.build(),
snapshotDbKeys, updatedSnapshotInfos);
- omMetrics.incNumSnapshotPurges();
+ omSnapshotIntMetrics.incNumSnapshotPurges();
LOG.info("Successfully executed snapshotPurgeRequest: {{}} along with
updating snapshots:{}.",
snapshotPurgeRequest, updatedSnapshotInfos);
} catch (IOException ex) {
omClientResponse = new OMSnapshotPurgeResponse(
createErrorOMResponse(omResponse, ex));
- omMetrics.incNumSnapshotPurgeFails();
+ omSnapshotIntMetrics.incNumSnapshotPurgeFails();
LOG.error("Failed to execute snapshotPurgeRequest:{{}}.",
snapshotPurgeRequest, ex);
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotSetPropertyRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotSetPropertyRequest.java
index 6491bd6391..850c8d8894 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotSetPropertyRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotSetPropertyRequest.java
@@ -31,7 +31,7 @@
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.om.OMMetadataManager;
-import org.apache.hadoop.ozone.om.OMMetrics;
+import org.apache.hadoop.ozone.om.OmSnapshotInternalMetrics;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.execution.flowcontrol.ExecutionContext;
@@ -85,7 +85,7 @@ private void updateSnapshotProperty(
@Override
public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
ExecutionContext context) {
- OMMetrics omMetrics = ozoneManager.getMetrics();
+ OmSnapshotInternalMetrics omSnapshotIntMetrics =
ozoneManager.getOmSnapshotIntMetrics();
OMClientResponse omClientResponse;
OMMetadataManager metadataManager = ozoneManager.getMetadataManager();
@@ -133,7 +133,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager
ozoneManager, Execut
metadataManager.getSnapshotInfoTable().addCacheEntry(
new CacheKey<>(snapshot.getKey()),
CacheValue.get(context.getIndex(), snapshot.getValue()));
- omMetrics.incNumSnapshotSetProperties();
+ omSnapshotIntMetrics.incNumSnapshotSetProperties();
}
omClientResponse = new OMSnapshotSetPropertyResponse(omResponse.build(),
snapshotInfoMap.values());
@@ -141,7 +141,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager
ozoneManager, Execut
} catch (UncheckedIOException | IOException ex) {
omClientResponse = new OMSnapshotSetPropertyResponse(
createErrorOMResponse(omResponse, ex));
- omMetrics.incNumSnapshotSetPropertyFails();
+ omSnapshotIntMetrics.incNumSnapshotSetPropertyFails();
LOG.error("Failed to execute snapshotSetPropertyRequest: {{}}.",
setSnapshotPropertyRequests, ex);
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotMoveTableKeysRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotMoveTableKeysRequest.java
index 89b57f9320..a815d7f0a7 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotMoveTableKeysRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotMoveTableKeysRequest.java
@@ -81,6 +81,9 @@ private SnapshotInfo deleteSnapshot(SnapshotInfo
snapshotInfo, long transactionI
@Test
public void testValidateAndUpdateCacheWithNextSnapshotInactive() throws
Exception {
+ long initialSnapshotMoveTableKeysCount =
getOmSnapshotIntMetrics().getNumSnapshotMoveTableKeys();
+ long initialSnapshotMoveTableKeysFailCount =
getOmSnapshotIntMetrics().getNumSnapshotMoveTableKeysFails();
+
createSnapshots(true);
snapshotInfo2 = deleteSnapshot(snapshotInfo2, 0);
OzoneManagerProtocolProtos.OMRequest omRequest =
moveSnapshotTableKeyRequest(snapshotInfo1.getSnapshotId(),
@@ -92,6 +95,11 @@ public void
testValidateAndUpdateCacheWithNextSnapshotInactive() throws Exceptio
Assertions.assertFalse(omClientResponse.getOMResponse().getSuccess());
Assertions.assertEquals(OzoneManagerProtocolProtos.Status.INVALID_SNAPSHOT_ERROR,
omClientResponse.getOMResponse().getStatus());
+
+ Assertions.assertEquals(initialSnapshotMoveTableKeysCount,
+ getOmSnapshotIntMetrics().getNumSnapshotMoveTableKeys());
+ Assertions.assertEquals(initialSnapshotMoveTableKeysFailCount + 1,
+ getOmSnapshotIntMetrics().getNumSnapshotMoveTableKeysFails());
}
@Test
@@ -186,6 +194,9 @@ public void testPreExecuteWithInvalidRenamePrefix() throws
Exception {
@Test
public void testValidateAndUpdateCache() throws Exception {
+ long initialSnapshotMoveTableKeysCount =
getOmSnapshotIntMetrics().getNumSnapshotMoveTableKeys();
+ long initialSnapshotMoveTableKeysFailCount =
getOmSnapshotIntMetrics().getNumSnapshotMoveTableKeysFails();
+
createSnapshots(true);
String invalidVolumeName = UUID.randomUUID().toString();
String invalidBucketName = UUID.randomUUID().toString();
@@ -203,6 +214,11 @@ public void testValidateAndUpdateCache() throws Exception {
Assertions.assertTrue(omClientResponse.getOMResponse().getSuccess());
Assertions.assertEquals(OzoneManagerProtocolProtos.Status.OK,
omClientResponse.getOMResponse().getStatus());
+
+ Assertions.assertEquals(initialSnapshotMoveTableKeysCount + 1,
+ getOmSnapshotIntMetrics().getNumSnapshotMoveTableKeys());
+ Assertions.assertEquals(initialSnapshotMoveTableKeysFailCount,
+ getOmSnapshotIntMetrics().getNumSnapshotMoveTableKeysFails());
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
index 1b97e3c3db..e0270f6e89 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
@@ -151,8 +151,8 @@ private void purgeSnapshots(OMRequest snapshotPurgeRequest)
@Test
public void testValidateAndUpdateCache() throws Exception {
- long initialSnapshotPurgeCount = getOmMetrics().getNumSnapshotPurges();
- long initialSnapshotPurgeFailCount =
getOmMetrics().getNumSnapshotPurgeFails();
+ long initialSnapshotPurgeCount =
getOmSnapshotIntMetrics().getNumSnapshotPurges();
+ long initialSnapshotPurgeFailCount =
getOmSnapshotIntMetrics().getNumSnapshotPurgeFails();
List<String> snapshotDbKeysToPurge = createSnapshots(10);
assertFalse(getOmMetadataManager().getSnapshotInfoTable().isEmpty());
@@ -180,8 +180,8 @@ public void testValidateAndUpdateCache() throws Exception {
for (Path checkpoint : checkpointPaths) {
assertFalse(Files.exists(checkpoint));
}
- assertEquals(initialSnapshotPurgeCount + 1,
getOmMetrics().getNumSnapshotPurges());
- assertEquals(initialSnapshotPurgeFailCount,
getOmMetrics().getNumSnapshotPurgeFails());
+ assertEquals(initialSnapshotPurgeCount + 1,
getOmSnapshotIntMetrics().getNumSnapshotPurges());
+ assertEquals(initialSnapshotPurgeFailCount,
getOmSnapshotIntMetrics().getNumSnapshotPurgeFails());
}
@Test
@@ -225,8 +225,8 @@ public void testDuplicateSnapshotPurge() throws Exception {
*/
@Test
public void testValidateAndUpdateCacheFailure() throws Exception {
- long initialSnapshotPurgeCount = getOmMetrics().getNumSnapshotPurges();
- long initialSnapshotPurgeFailCount =
getOmMetrics().getNumSnapshotPurgeFails();
+ long initialSnapshotPurgeCount =
getOmSnapshotIntMetrics().getNumSnapshotPurges();
+ long initialSnapshotPurgeFailCount =
getOmSnapshotIntMetrics().getNumSnapshotPurgeFails();
List<String> snapshotDbKeysToPurge = createSnapshots(10);
@@ -244,8 +244,8 @@ public void testValidateAndUpdateCacheFailure() throws
Exception {
omSnapshotPurgeRequest.validateAndUpdateCache(getOzoneManager(), 200L);
assertEquals(INTERNAL_ERROR,
omSnapshotPurgeResponse.getOMResponse().getStatus());
- assertEquals(initialSnapshotPurgeCount,
getOmMetrics().getNumSnapshotPurges());
- assertEquals(initialSnapshotPurgeFailCount + 1,
getOmMetrics().getNumSnapshotPurgeFails());
+ assertEquals(initialSnapshotPurgeCount,
getOmSnapshotIntMetrics().getNumSnapshotPurges());
+ assertEquals(initialSnapshotPurgeFailCount + 1,
getOmSnapshotIntMetrics().getNumSnapshotPurgeFails());
}
// TODO: clean up: Do we this test after
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotSetPropertyRequestAndResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotSetPropertyRequestAndResponse.java
index fc780665f3..50d5417c3f 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotSetPropertyRequestAndResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotSetPropertyRequestAndResponse.java
@@ -62,8 +62,8 @@ void setup() {
@Test
public void testValidateAndUpdateCache() throws IOException {
- long initialSnapshotSetPropertyCount =
getOmMetrics().getNumSnapshotSetProperties();
- long initialSnapshotSetPropertyFailCount =
getOmMetrics().getNumSnapshotSetPropertyFails();
+ long initialSnapshotSetPropertyCount =
getOmSnapshotIntMetrics().getNumSnapshotSetProperties();
+ long initialSnapshotSetPropertyFailCount =
getOmSnapshotIntMetrics().getNumSnapshotSetPropertyFails();
createSnapshotDataForTest();
assertFalse(getOmMetadataManager().getSnapshotInfoTable().isEmpty());
@@ -91,8 +91,8 @@ public void testValidateAndUpdateCache() throws IOException {
}
assertEquals(initialSnapshotSetPropertyCount +
snapshotUpdateSizeRequests.size(),
- getOmMetrics().getNumSnapshotSetProperties());
- assertEquals(initialSnapshotSetPropertyFailCount,
getOmMetrics().getNumSnapshotSetPropertyFails());
+ getOmSnapshotIntMetrics().getNumSnapshotSetProperties());
+ assertEquals(initialSnapshotSetPropertyFailCount,
getOmSnapshotIntMetrics().getNumSnapshotSetPropertyFails());
// Check if the exclusive size is set.
try (TableIterator<String, ? extends Table.KeyValue<String, SnapshotInfo>>
iterator =
getOmMetadataManager().getSnapshotInfoTable().iterator()) {
@@ -112,8 +112,8 @@ public void testValidateAndUpdateCache() throws IOException
{
*/
@Test
public void testValidateAndUpdateCacheFailure() throws IOException {
- long initialSnapshotSetPropertyCount =
getOmMetrics().getNumSnapshotSetProperties();
- long initialSnapshotSetPropertyFailCount =
getOmMetrics().getNumSnapshotSetPropertyFails();
+ long initialSnapshotSetPropertyCount =
getOmSnapshotIntMetrics().getNumSnapshotSetProperties();
+ long initialSnapshotSetPropertyFailCount =
getOmSnapshotIntMetrics().getNumSnapshotSetPropertyFails();
createSnapshotDataForTest();
assertFalse(getOmMetadataManager().getSnapshotInfoTable().isEmpty());
@@ -138,9 +138,9 @@ public void testValidateAndUpdateCacheFailure() throws
IOException {
assertEquals(INTERNAL_ERROR,
omSnapshotSetPropertyResponse.getOMResponse().getStatus());
}
- assertEquals(initialSnapshotSetPropertyCount,
getOmMetrics().getNumSnapshotSetProperties());
+ assertEquals(initialSnapshotSetPropertyCount,
getOmSnapshotIntMetrics().getNumSnapshotSetProperties());
assertEquals(initialSnapshotSetPropertyFailCount +
snapshotUpdateSizeRequests.size(),
- getOmMetrics().getNumSnapshotSetPropertyFails());
+ getOmSnapshotIntMetrics().getNumSnapshotSetPropertyFails());
}
private void assertCacheValues(String dbKey) {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotRequestAndResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotRequestAndResponse.java
index 6ee1f7249b..cb0b305206 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotRequestAndResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotRequestAndResponse.java
@@ -48,6 +48,7 @@
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OMMetrics;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
+import org.apache.hadoop.ozone.om.OmSnapshotInternalMetrics;
import org.apache.hadoop.ozone.om.OmSnapshotManager;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.ResolvedBucket;
@@ -76,6 +77,7 @@ public class TestSnapshotRequestAndResponse {
private OzoneManager ozoneManager;
private OMMetrics omMetrics;
+ private OmSnapshotInternalMetrics omSnapshotIntMetrics;
private OmMetadataManagerImpl omMetadataManager;
private BatchOperation batchOperation;
private OmSnapshotManager omSnapshotManager;
@@ -104,6 +106,10 @@ public OMMetrics getOmMetrics() {
return omMetrics;
}
+ public OmSnapshotInternalMetrics getOmSnapshotIntMetrics() {
+ return omSnapshotIntMetrics;
+ }
+
public OmSnapshotManager getOmSnapshotManager() {
return omSnapshotManager;
}
@@ -132,6 +138,7 @@ protected TestSnapshotRequestAndResponse(boolean isAdmin) {
public void baseSetup() throws Exception {
ozoneManager = mock(OzoneManager.class);
omMetrics = OMMetrics.create();
+ omSnapshotIntMetrics = OmSnapshotInternalMetrics.create();
OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
ozoneConfiguration.set(OMConfigKeys.OZONE_OM_DB_DIRS,
testDir.getAbsolutePath());
@@ -144,6 +151,7 @@ public void baseSetup() throws Exception {
.thenAnswer(i -> new ResolvedBucket(i.getArgument(0),
i.getArgument(0), "dummyBucketOwner",
BucketLayout.FILE_SYSTEM_OPTIMIZED));
when(ozoneManager.getMetrics()).thenReturn(omMetrics);
+
when(ozoneManager.getOmSnapshotIntMetrics()).thenReturn(omSnapshotIntMetrics);
when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager);
when(ozoneManager.isFilesystemSnapshotEnabled()).thenReturn(true);
when(ozoneManager.isAdmin(any())).thenReturn(isAdmin);
@@ -172,6 +180,7 @@ public void baseSetup() throws Exception {
@AfterEach
public void stop() {
omMetrics.unRegister();
+ omSnapshotIntMetrics.unregister();
framework().clearInlineMocks();
if (batchOperation != null) {
batchOperation.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
