Skip to content

HDDS-12306. OmMetadataManager metrics are always zero #7853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 2 commits into from
Feb 14, 2025
Merged

HDDS-12306. OmMetadataManager metrics are always zero #7853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82f033b
HDDS-12306. OmMetadataManager metrics are always zero.
jojochuang Feb 10, 2025
d3e9431
Fix test
jojochuang Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions ...p-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Comment on lines +344 to +348
Copy link
Contributor

@adoroszlai adoroszlai Feb 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: reduce verbosity

Suggested change
if (this.ozoneManager == null) {
this.perfMetrics = null;
} else {
this.perfMetrics = this.ozoneManager.getPerfMetrics();
}
perfMetrics = ozoneManager != null ? ozoneManager.getPerfMetrics() : null;

this.lock = new OzoneManagerLock(conf);
this.omEpoch = OmUtils.getOMEpoch();
// For test purpose only
Expand Down
7 changes: 6 additions & 1 deletion ...java/org/apache/hadoop/ozone/om/request/s3/tenant/TestSetRangerServiceVersionRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
Loading