Skip to content

HDDS-6311. Fix number of keys displayed in Recon Overview. #3081

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
rakeshadr merged 1 commit into from
Feb 16, 2022
Merged

HDDS-6311. Fix number of keys displayed in Recon Overview. #3081

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ClusterStateEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.BUCKET_TABLE;
import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.KEY_TABLE;
import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.VOLUME_TABLE;
import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.FILE_TABLE;

/**
* Endpoint to fetch current state of ozone cluster.
Expand Down Expand Up @@ -92,17 +93,29 @@ public Response getClusterState() {
TableCountTask.getRowKeyFromTable(VOLUME_TABLE));
GlobalStats bucketRecord = globalStatsDao.findById(
TableCountTask.getRowKeyFromTable(BUCKET_TABLE));
// Keys from OBJECT_STORE buckets.
GlobalStats keyRecord = globalStatsDao.findById(
TableCountTask.getRowKeyFromTable(KEY_TABLE));
// Keys from FILE_SYSTEM_OPTIMIZED buckets
GlobalStats fileRecord = globalStatsDao.findById(
TableCountTask.getRowKeyFromTable(FILE_TABLE));

if (volumeRecord != null) {
builder.setVolumes(volumeRecord.getValue());
}
if (bucketRecord != null) {
builder.setBuckets(bucketRecord.getValue());
}

Long totalKeys = 0L;
if (keyRecord != null) {
builder.setKeys(keyRecord.getValue());
totalKeys += keyRecord.getValue();
}
if (fileRecord != null) {
totalKeys += fileRecord.getValue();
}
builder.setKeys(totalKeys);

ClusterStateResponse response = builder
.setStorageReport(storageReport)
.setPipelines(pipelines)
Expand Down