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 199795c23e HDDS-12306. OmMetadataManager metrics are always zero
(#7853)
199795c23e is described below
commit 199795c23e9f8a60c1655d0e4b316e5c9c1a7ea1
Author: Wei-Chiu Chuang <[email protected]>
AuthorDate: Fri Feb 14 12:40:44 2025 -0800
HDDS-12306. OmMetadataManager metrics are always zero (#7853)
---
.../org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java | 13 +++++--------
.../s3/tenant/TestSetRangerServiceVersionRequest.java | 7 ++++++-
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
index 3eecbee432..4558b02bcd 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
@@ -341,15 +341,12 @@ public class OmMetadataManagerImpl implements
OMMetadataManager,
*/
public OmMetadataManagerImpl(OzoneConfiguration conf,
OzoneManager ozoneManager) throws IOException {
- this(conf, ozoneManager, null);
- }
-
- public OmMetadataManagerImpl(OzoneConfiguration conf,
- OzoneManager ozoneManager,
- OMPerformanceMetrics perfMetrics)
- throws IOException {
this.ozoneManager = ozoneManager;
- this.perfMetrics = perfMetrics;
+ if (this.ozoneManager == null) {
+ this.perfMetrics = null;
+ } else {
+ this.perfMetrics = this.ozoneManager.getPerfMetrics();
+ }
this.lock = new OzoneManagerLock(conf);
this.omEpoch = OmUtils.getOMEpoch();
// For test purpose only
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tenant/TestSetRangerServiceVersionRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tenant/TestSetRangerServiceVersionRequest.java
index a6b87b1735..77745216c9 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tenant/TestSetRangerServiceVersionRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tenant/TestSetRangerServiceVersionRequest.java
@@ -24,6 +24,7 @@
import static org.mockito.Mockito.when;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.om.OMConfigKeys;
+import org.apache.hadoop.ozone.om.OMPerformanceMetrics;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
@@ -60,8 +61,12 @@ public void setUp() throws Exception {
final OzoneConfiguration conf = new OzoneConfiguration();
conf.set(OMConfigKeys.OZONE_OM_DB_DIRS,
folder.toAbsolutePath().toString());
+ OmMetadataManagerImpl omMetadataManager = new OmMetadataManagerImpl(conf,
+ ozoneManager);
when(ozoneManager.getMetadataManager())
- .thenReturn(new OmMetadataManagerImpl(conf, ozoneManager));
+ .thenReturn(omMetadataManager);
+ OMPerformanceMetrics omPerformanceMetrics =
mock(OMPerformanceMetrics.class);
+ when(ozoneManager.getPerfMetrics()).thenReturn(omPerformanceMetrics);
}
@AfterEach
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
