This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 87d8d6155c HDDS-10467. Reduce metrics visibility (#6332)
87d8d6155c is described below
commit 87d8d6155ca1d68773061017385c11fcfde43214
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Mar 6 13:13:08 2024 +0100
HDDS-10467. Reduce metrics visibility (#6332)
---
.../hadoop/hdds/scm/ContainerClientMetrics.java | 15 ++++-------
.../hadoop/ozone/grpc/metrics/GrpcMetrics.java | 4 +--
.../common/transport/server/ratis/CSMMetrics.java | 15 +----------
.../container/replication/MeasuredReplicator.java | 22 +++++-----------
.../hdds/server/events/EventWatcherMetrics.java | 14 +++-------
.../hadoop/hdds/scm/safemode/SafeModeMetrics.java | 12 ++++-----
.../hdds/scm/security/RootCARotationMetrics.java | 2 +-
.../ozone/recon/TestReconWithOzoneManager.java | 10 ++++----
.../hadoop/ozone/om/OMPerformanceMetrics.java | 26 +++++++++----------
.../ozone/om/ratis/OzoneManagerDoubleBuffer.java | 6 -----
.../OzoneManagerDoubleBufferMetrics.java | 10 +++-----
.../ozone/om/ratis/metrics/package-info.java | 21 ---------------
.../om/ratis/TestOzoneManagerDoubleBuffer.java | 1 -
...tOzoneManagerDoubleBufferWithDummyResponse.java | 1 -
.../recon/metrics/OzoneManagerSyncMetrics.java | 30 +++++++++++-----------
.../impl/TestOzoneManagerServiceProviderImpl.java | 16 ++++++------
16 files changed, 70 insertions(+), 135 deletions(-)
diff --git
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/ContainerClientMetrics.java
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/ContainerClientMetrics.java
index 1045f7a6a1..d51dfa4163 100644
---
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/ContainerClientMetrics.java
+++
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/ContainerClientMetrics.java
@@ -111,28 +111,23 @@ public final class ContainerClientMetrics {
totalWriteChunkBytes.incr(chunkSizeBytes);
}
- @VisibleForTesting
- public MutableCounterLong getTotalWriteChunkBytes() {
+ MutableCounterLong getTotalWriteChunkBytes() {
return totalWriteChunkBytes;
}
- @VisibleForTesting
- public MutableCounterLong getTotalWriteChunkCalls() {
+ MutableCounterLong getTotalWriteChunkCalls() {
return totalWriteChunkCalls;
}
- @VisibleForTesting
- public Map<PipelineID, MutableCounterLong> getWriteChunkBytesByPipeline() {
+ Map<PipelineID, MutableCounterLong> getWriteChunkBytesByPipeline() {
return writeChunkBytesByPipeline;
}
- @VisibleForTesting
- public Map<PipelineID, MutableCounterLong> getWriteChunkCallsByPipeline() {
+ Map<PipelineID, MutableCounterLong> getWriteChunkCallsByPipeline() {
return writeChunkCallsByPipeline;
}
- @VisibleForTesting
- public Map<UUID, MutableCounterLong> getWriteChunksCallsByLeaders() {
+ Map<UUID, MutableCounterLong> getWriteChunksCallsByLeaders() {
return writeChunksCallsByLeaders;
}
}
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/grpc/metrics/GrpcMetrics.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/grpc/metrics/GrpcMetrics.java
index 23c3dbaf15..6bd83b44a9 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/grpc/metrics/GrpcMetrics.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/grpc/metrics/GrpcMetrics.java
@@ -200,11 +200,11 @@ public class GrpcMetrics implements MetricsSource {
return unknownMessagesReceived.value();
}
- public MutableRate getGrpcQueueTime() {
+ MutableRate getGrpcQueueTime() {
return grpcQueueTime;
}
- public MutableRate getGrpcProcessingTime() {
+ MutableRate getGrpcProcessingTime() {
return grpcProcessingTime;
}
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java
index b776dc903d..87572768e4 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.ozone.container.common.transport.server.ratis;
-import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.hdds.annotation.InterfaceAudience;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.metrics2.MetricsSystem;
@@ -132,67 +131,55 @@ public class CSMMetrics {
numApplyTransactionFails.incr();
}
- @VisibleForTesting
public long getNumWriteStateMachineOps() {
return numWriteStateMachineOps.value();
}
- @VisibleForTesting
public long getNumQueryStateMachineOps() {
return numQueryStateMachineOps.value();
}
- @VisibleForTesting
public long getNumApplyTransactionsOps() {
return numApplyTransactionOps.value();
}
- @VisibleForTesting
public long getNumWriteStateMachineFails() {
return numWriteStateMachineFails.value();
}
- @VisibleForTesting
public long getNumWriteDataFails() {
return numWriteDataFails.value();
}
- @VisibleForTesting
public long getNumQueryStateMachineFails() {
return numQueryStateMachineFails.value();
}
- @VisibleForTesting
public long getNumApplyTransactionsFails() {
return numApplyTransactionFails.value();
}
- @VisibleForTesting
public long getNumReadStateMachineFails() {
return numReadStateMachineFails.value();
}
- @VisibleForTesting
public long getNumReadStateMachineMissCount() {
return numReadStateMachineMissCount.value();
}
- @VisibleForTesting
public long getNumReadStateMachineOps() {
return numReadStateMachineOps.value();
}
- @VisibleForTesting
public long getNumBytesWrittenCount() {
return numBytesWrittenCount.value();
}
- @VisibleForTesting
public long getNumBytesCommittedCount() {
return numBytesCommittedCount.value();
}
- public MutableRate getApplyTransactionLatencyNs() {
+ MutableRate getApplyTransactionLatencyNs() {
return applyTransactionNs;
}
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/MeasuredReplicator.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/MeasuredReplicator.java
index fa3763d880..7becbe7521 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/MeasuredReplicator.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/MeasuredReplicator.java
@@ -27,7 +27,6 @@ import org.apache.hadoop.metrics2.lib.MutableCounterLong;
import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
import
org.apache.hadoop.ozone.container.replication.AbstractReplicationTask.Status;
-import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.util.Time;
/**
@@ -98,38 +97,31 @@ public class MeasuredReplicator implements
ContainerReplicator, AutoCloseable {
DefaultMetricsSystem.instance().unregisterSource(metricsName());
}
- @VisibleForTesting
- public MutableCounterLong getSuccess() {
+ MutableCounterLong getSuccess() {
return success;
}
- @VisibleForTesting
- public MutableGaugeLong getSuccessTime() {
+ MutableGaugeLong getSuccessTime() {
return successTime;
}
- @VisibleForTesting
- public MutableGaugeLong getFailureTime() {
+ MutableGaugeLong getFailureTime() {
return failureTime;
}
- @VisibleForTesting
- public MutableCounterLong getFailure() {
+ MutableCounterLong getFailure() {
return failure;
}
- @VisibleForTesting
- public MutableGaugeLong getQueueTime() {
+ MutableGaugeLong getQueueTime() {
return queueTime;
}
- @VisibleForTesting
- public MutableGaugeLong getTransferredBytes() {
+ MutableGaugeLong getTransferredBytes() {
return transferredBytes;
}
- @VisibleForTesting
- public MutableGaugeLong getFailureBytes() {
+ MutableGaugeLong getFailureBytes() {
return failureBytes;
}
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/EventWatcherMetrics.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/EventWatcherMetrics.java
index dc217476a6..0473867308 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/EventWatcherMetrics.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/EventWatcherMetrics.java
@@ -21,8 +21,6 @@ import org.apache.hadoop.metrics2.annotation.Metric;
import org.apache.hadoop.metrics2.lib.MutableCounterLong;
import org.apache.hadoop.metrics2.lib.MutableRate;
-import com.google.common.annotations.VisibleForTesting;
-
/**
* Metrics for any event watcher.
*/
@@ -56,23 +54,19 @@ public class EventWatcherMetrics {
completionTime.add(duration);
}
- @VisibleForTesting
- public MutableCounterLong getTrackedEvents() {
+ MutableCounterLong getTrackedEvents() {
return trackedEvents;
}
- @VisibleForTesting
- public MutableCounterLong getTimedOutEvents() {
+ MutableCounterLong getTimedOutEvents() {
return timedOutEvents;
}
- @VisibleForTesting
- public MutableCounterLong getCompletedEvents() {
+ MutableCounterLong getCompletedEvents() {
return completedEvents;
}
- @VisibleForTesting
- public MutableRate getCompletionTime() {
+ MutableRate getCompletionTime() {
return completionTime;
}
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SafeModeMetrics.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SafeModeMetrics.java
index 80b8257c40..e1a7d2dca5 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SafeModeMetrics.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SafeModeMetrics.java
@@ -78,28 +78,28 @@ public class SafeModeMetrics {
this.currentContainersWithOneReplicaReportedCount.incr();
}
- public MutableCounterLong getNumHealthyPipelinesThreshold() {
+ MutableCounterLong getNumHealthyPipelinesThreshold() {
return numHealthyPipelinesThreshold;
}
- public MutableCounterLong getCurrentHealthyPipelinesCount() {
+ MutableCounterLong getCurrentHealthyPipelinesCount() {
return currentHealthyPipelinesCount;
}
- public MutableCounterLong
+ MutableCounterLong
getNumPipelinesWithAtleastOneReplicaReportedThreshold() {
return numPipelinesWithAtleastOneReplicaReportedThreshold;
}
- public MutableCounterLong getCurrentPipelinesWithAtleastOneReplicaCount() {
+ MutableCounterLong getCurrentPipelinesWithAtleastOneReplicaCount() {
return currentPipelinesWithAtleastOneReplicaReportedCount;
}
- public MutableCounterLong getNumContainerWithOneReplicaReportedThreshold() {
+ MutableCounterLong getNumContainerWithOneReplicaReportedThreshold() {
return numContainerWithOneReplicaReportedThreshold;
}
- public MutableCounterLong getCurrentContainersWithOneReplicaReportedCount() {
+ MutableCounterLong getCurrentContainersWithOneReplicaReportedCount() {
return currentContainersWithOneReplicaReportedCount;
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationMetrics.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationMetrics.java
index fcd52d0ebd..1c1a1c6245 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationMetrics.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationMetrics.java
@@ -67,7 +67,7 @@ public final class RootCARotationMetrics {
this.ms = ms;
}
- public MutableGaugeLong getSuccessTimeInNs() {
+ MutableGaugeLong getSuccessTimeInNs() {
return successTimeInNs;
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java
index 9589b1c400..c0e5acc20e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java
@@ -202,7 +202,7 @@ public class TestReconWithOzoneManager {
// verify sequence number after full snapshot
assertEquals(omLatestSeqNumber, reconLatestSeqNumber);
- assertEquals(0, metrics.getSequenceNumberLag().value());
+ assertEquals(0, metrics.getSequenceNumberLag());
//add 4 keys to check for delta updates
addKeys(1, 5);
@@ -220,7 +220,7 @@ public class TestReconWithOzoneManager {
//verify sequence number after Delta Updates
assertEquals(omLatestSeqNumber, reconLatestSeqNumber);
- assertEquals(0, metrics.getSequenceNumberLag().value());
+ assertEquals(0, metrics.getSequenceNumberLag());
long beforeRestartSnapShotTimeStamp = getReconTaskAttributeFromJson(
taskStatusResponse,
@@ -260,7 +260,7 @@ public class TestReconWithOzoneManager {
//verify sequence number after Delta Updates
assertEquals(omLatestSeqNumber, reconLatestSeqNumber);
- assertEquals(0, metrics.getSequenceNumberLag().value());
+ assertEquals(0, metrics.getSequenceNumberLag());
}
// This test simulates the mis-match in sequence number between Recon OM
@@ -314,7 +314,7 @@ public class TestReconWithOzoneManager {
// verify sequence number after incremental delta snapshot
assertEquals(omLatestSeqNumber, reconLatestSeqNumber);
- assertEquals(0, metrics.getSequenceNumberLag().value());
+ assertEquals(0, metrics.getSequenceNumberLag());
String volume = "vol15";
String bucket = "bucket15";
@@ -356,7 +356,7 @@ public class TestReconWithOzoneManager {
reconLatestSeqNumber =
((RDBStore) reconMetadataManagerInstance.getStore()).getDb()
.getLatestSequenceNumber();
- assertEquals(0, metrics.getSequenceNumberLag().value());
+ assertEquals(0, metrics.getSequenceNumberLag());
assertEquals(omLatestSeqNumber, reconLatestSeqNumber);
reconLatestSeqNumber =
((RDBStore) reconMetadataManagerInstance.getStore()).getDb()
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMPerformanceMetrics.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMPerformanceMetrics.java
index d118e2f4ec..f2f1102515 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMPerformanceMetrics.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMPerformanceMetrics.java
@@ -123,20 +123,20 @@ public class OMPerformanceMetrics {
lookupLatencyNs.add(latencyInNs);
}
- public MutableRate getLookupRefreshLocationLatencyNs() {
+ MutableRate getLookupRefreshLocationLatencyNs() {
return lookupRefreshLocationLatencyNs;
}
- public MutableRate getLookupGenerateBlockTokenLatencyNs() {
+ MutableRate getLookupGenerateBlockTokenLatencyNs() {
return lookupGenerateBlockTokenLatencyNs;
}
- public MutableRate getLookupReadKeyInfoLatencyNs() {
+ MutableRate getLookupReadKeyInfoLatencyNs() {
return lookupReadKeyInfoLatencyNs;
}
- public MutableRate getLookupAclCheckLatencyNs() {
+ MutableRate getLookupAclCheckLatencyNs() {
return lookupAclCheckLatencyNs;
}
@@ -144,7 +144,7 @@ public class OMPerformanceMetrics {
s3VolumeContextLatencyNs.add(latencyInNs);
}
- public MutableRate getLookupResolveBucketLatencyNs() {
+ MutableRate getLookupResolveBucketLatencyNs() {
return lookupResolveBucketLatencyNs;
}
@@ -152,27 +152,27 @@ public class OMPerformanceMetrics {
getKeyInfoLatencyNs.add(value);
}
- public MutableRate getGetKeyInfoAclCheckLatencyNs() {
+ MutableRate getGetKeyInfoAclCheckLatencyNs() {
return getKeyInfoAclCheckLatencyNs;
}
- public MutableRate getGetKeyInfoGenerateBlockTokenLatencyNs() {
+ MutableRate getGetKeyInfoGenerateBlockTokenLatencyNs() {
return getKeyInfoGenerateBlockTokenLatencyNs;
}
- public MutableRate getGetKeyInfoReadKeyInfoLatencyNs() {
+ MutableRate getGetKeyInfoReadKeyInfoLatencyNs() {
return getKeyInfoReadKeyInfoLatencyNs;
}
- public MutableRate getGetKeyInfoRefreshLocationLatencyNs() {
+ MutableRate getGetKeyInfoRefreshLocationLatencyNs() {
return getKeyInfoRefreshLocationLatencyNs;
}
- public MutableRate getGetKeyInfoResolveBucketLatencyNs() {
+ MutableRate getGetKeyInfoResolveBucketLatencyNs() {
return getKeyInfoResolveBucketLatencyNs;
}
- public MutableRate getGetKeyInfoSortDatanodesLatencyNs() {
+ MutableRate getGetKeyInfoSortDatanodesLatencyNs() {
return getKeyInfoSortDatanodesLatencyNs;
}
@@ -216,11 +216,11 @@ public class OMPerformanceMetrics {
return validateAndUpdateCacheLatencyNs;
}
- public MutableRate getListKeysAclCheckLatencyNs() {
+ MutableRate getListKeysAclCheckLatencyNs() {
return listKeysAclCheckLatencyNs;
}
- public MutableRate getListKeysResolveBucketLatencyNs() {
+ MutableRate getListKeysResolveBucketLatencyNs() {
return listKeysResolveBucketLatencyNs;
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
index d3db4120e6..857005bd92 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
@@ -44,7 +44,6 @@ import
org.apache.hadoop.hdds.utils.db.DBColumnFamilyDefinition;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.S3SecretManager;
import org.apache.hadoop.ozone.om.codec.OMDBDefinition;
-import
org.apache.hadoop.ozone.om.ratis.metrics.OzoneManagerDoubleBufferMetrics;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
@@ -595,29 +594,24 @@ public final class OzoneManagerDoubleBuffer {
readyBuffer = temp;
}
- @VisibleForTesting
OzoneManagerDoubleBufferMetrics getMetrics() {
return metrics;
}
/** @return the flushed transaction count to OM DB. */
- @VisibleForTesting
long getFlushedTransactionCountForTesting() {
return flushedTransactionCount.get();
}
/** @return total number of flush iterations run by sync thread. */
- @VisibleForTesting
long getFlushIterationsForTesting() {
return flushIterations.get();
}
- @VisibleForTesting
int getCurrentBufferSize() {
return currentBuffer.size();
}
- @VisibleForTesting
int getReadyBufferSize() {
return readyBuffer.size();
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/metrics/OzoneManagerDoubleBufferMetrics.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBufferMetrics.java
similarity index 95%
rename from
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/metrics/OzoneManagerDoubleBufferMetrics.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBufferMetrics.java
index 351f185289..afa162cc3a 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/metrics/OzoneManagerDoubleBufferMetrics.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBufferMetrics.java
@@ -16,9 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.om.ratis.metrics;
-
-import com.google.common.annotations.VisibleForTesting;
+package org.apache.hadoop.ozone.om.ratis;
import org.apache.hadoop.metrics2.MetricsSystem;
import org.apache.hadoop.metrics2.annotation.Metric;
@@ -114,8 +112,7 @@ public class OzoneManagerDoubleBufferMetrics {
flushTime.add(time);
}
- @VisibleForTesting
- public MutableRate getFlushTime() {
+ MutableRate getFlushTime() {
return flushTime;
}
@@ -142,8 +139,7 @@ public class OzoneManagerDoubleBufferMetrics {
updateQueueSize(flushedTransactionsInOneIteration);
}
- @VisibleForTesting
- public MutableStat getQueueSize() {
+ MutableStat getQueueSize() {
return queueSize;
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/metrics/package-info.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/metrics/package-info.java
deleted file mode 100644
index e41c645b58..0000000000
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/metrics/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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 which contains metrics classes.
- */
-package org.apache.hadoop.ozone.om.ratis.metrics;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBuffer.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBuffer.java
index e4dd0ab5ad..125c9efcaf 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBuffer.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBuffer.java
@@ -39,7 +39,6 @@ import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.S3SecretManagerImpl;
import org.apache.hadoop.ozone.om.S3SecretCache;
import org.apache.hadoop.ozone.om.S3SecretLockedManager;
-import
org.apache.hadoop.ozone.om.ratis.metrics.OzoneManagerDoubleBufferMetrics;
import org.apache.hadoop.ozone.om.request.s3.security.S3GetSecretRequest;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.om.response.bucket.OMBucketCreateResponse;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java
index 61be29eade..2227218299 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java
@@ -37,7 +37,6 @@ import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.CreateBucketResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.OMResponse;
-import
org.apache.hadoop.ozone.om.ratis.metrics.OzoneManagerDoubleBufferMetrics;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/metrics/OzoneManagerSyncMetrics.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/metrics/OzoneManagerSyncMetrics.java
index e6ad328ab9..e1a3c97d2b 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/metrics/OzoneManagerSyncMetrics.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/metrics/OzoneManagerSyncMetrics.java
@@ -107,39 +107,39 @@ public final class OzoneManagerSyncMetrics {
averageNumUpdatesInDeltaRequest.set(avg);
}
- public MutableCounterLong getNumSnapshotRequests() {
- return numSnapshotRequests;
+ public long getNumSnapshotRequests() {
+ return numSnapshotRequests.value();
}
- public MutableCounterLong getNumSnapshotRequestsFailed() {
- return numSnapshotRequestsFailed;
+ public long getNumSnapshotRequestsFailed() {
+ return numSnapshotRequestsFailed.value();
}
- public MutableRate getSnapshotRequestLatency() {
+ MutableRate getSnapshotRequestLatency() {
return snapshotRequestLatency;
}
- public MutableCounterLong getNumDeltaRequestsFailed() {
- return numDeltaRequestsFailed;
+ public long getNumDeltaRequestsFailed() {
+ return numDeltaRequestsFailed.value();
}
- public MutableCounterLong getNumUpdatesInDeltaTotal() {
- return numUpdatesInDeltaTotal;
+ public long getNumUpdatesInDeltaTotal() {
+ return numUpdatesInDeltaTotal.value();
}
- public MutableGaugeFloat getAverageNumUpdatesInDeltaRequest() {
- return averageNumUpdatesInDeltaRequest;
+ public float getAverageNumUpdatesInDeltaRequest() {
+ return averageNumUpdatesInDeltaRequest.value();
}
- public MutableCounterLong getNumNonZeroDeltaRequests() {
- return numNonZeroDeltaRequests;
+ public long getNumNonZeroDeltaRequests() {
+ return numNonZeroDeltaRequests.value();
}
public void setSequenceNumberLag(long lag) {
sequenceNumberLag.set(lag);
}
- public MutableGaugeLong getSequenceNumberLag() {
- return sequenceNumberLag;
+ public long getSequenceNumberLag() {
+ return sequenceNumberLag.value();
}
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestOzoneManagerServiceProviderImpl.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestOzoneManagerServiceProviderImpl.java
index d15cd6142d..032bff80ad 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestOzoneManagerServiceProviderImpl.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestOzoneManagerServiceProviderImpl.java
@@ -297,8 +297,8 @@ public class TestOzoneManagerServiceProviderImpl {
OzoneManagerSyncMetrics metrics = ozoneManagerServiceProvider.getMetrics();
assertEquals(4.0,
- metrics.getAverageNumUpdatesInDeltaRequest().value(), 0.0);
- assertEquals(1, metrics.getNumNonZeroDeltaRequests().value());
+ metrics.getAverageNumUpdatesInDeltaRequest(), 0.0);
+ assertEquals(1, metrics.getNumNonZeroDeltaRequests());
// In this method, we have to assert the "GET" path and the "APPLY" path.
@@ -372,8 +372,8 @@ public class TestOzoneManagerServiceProviderImpl {
OzoneManagerSyncMetrics metrics = ozoneManagerServiceProvider.getMetrics();
assertEquals(1.0,
- metrics.getAverageNumUpdatesInDeltaRequest().value(), 0.0);
- assertEquals(3, metrics.getNumNonZeroDeltaRequests().value());
+ metrics.getAverageNumUpdatesInDeltaRequest(), 0.0);
+ assertEquals(3, metrics.getNumNonZeroDeltaRequests());
// In this method, we have to assert the "GET" path and the "APPLY" path.
@@ -417,7 +417,7 @@ public class TestOzoneManagerServiceProviderImpl {
reconTaskControllerMock, new ReconUtils(), ozoneManagerProtocol);
OzoneManagerSyncMetrics metrics = ozoneManagerServiceProvider.getMetrics();
- assertEquals(0, metrics.getNumSnapshotRequests().value());
+ assertEquals(0, metrics.getNumSnapshotRequests());
// Should trigger full snapshot request.
ozoneManagerServiceProvider.syncDataFromOM();
@@ -429,7 +429,7 @@ public class TestOzoneManagerServiceProviderImpl {
assertEquals(OmSnapshotRequest.name(), captor.getValue().getTaskName());
verify(reconTaskControllerMock, times(1))
.reInitializeTasks(omMetadataManager);
- assertEquals(1, metrics.getNumSnapshotRequests().value());
+ assertEquals(1, metrics.getNumSnapshotRequests());
}
@Test
@@ -470,7 +470,7 @@ public class TestOzoneManagerServiceProviderImpl {
verify(reconTaskControllerMock, times(1))
.consumeOMEvents(any(OMUpdateEventBatch.class),
any(OMMetadataManager.class));
- assertEquals(0, metrics.getNumSnapshotRequests().value());
+ assertEquals(0, metrics.getNumSnapshotRequests());
}
@Test
@@ -509,7 +509,7 @@ public class TestOzoneManagerServiceProviderImpl {
assertEquals(OmSnapshotRequest.name(), captor.getValue().getTaskName());
verify(reconTaskControllerMock, times(1))
.reInitializeTasks(omMetadataManager);
- assertEquals(1, metrics.getNumSnapshotRequests().value());
+ assertEquals(1, metrics.getNumSnapshotRequests());
}
private ReconTaskController getMockTaskController() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
