From 82f033bebca52715728294e03edc961c9346ad3b Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Mon, 10 Feb 2025 15:31:34 -0800 Subject: [PATCH 1/2] HDDS-12306. OmMetadataManager metrics are always zero. Change-Id: I6bf7af12e576358a8f7764d93841ecbb7a21d95e Fix Change-Id: I8f827c0fa1e5a13b60a4dfc8917544d22fbad77d --- .../hadoop/ozone/om/OmMetadataManagerImpl.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 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 c40abe4602a7..e55a4b48204f 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 @@ -340,15 +340,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 From d3e943189141a076ceb540071fe5dd701147726a Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 11 Feb 2025 08:10:21 -0800 Subject: [PATCH 2/2] Fix test Change-Id: I82e1ace31a68e62b62deb008d5c4634a7f261e96 --- .../s3/tenant/TestSetRangerServiceVersionRequest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 a6b87b173507..77745216c937 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