Skip to content

HDDS-15446. Expose Hard Min Free Space Threshold via JMX #10575

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

Open
anuragp010 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HDDS-15446. Expose Hard Min Free Space Threshold via JMX #10575

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions ...vice/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfoMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ public class VolumeInfoMetrics implements MetricsSource {
Interns.info("MinFreeSpace",
"Minimum free space threshold (soft limit) reported to SCM, " +
"derived from hdds.datanode.volume.min.free.space.percent / hdds.datanode.volume.min.free.space");
private static final MetricsInfo HARD_MIN_FREE_SPACE =
Interns.info("HardMinFreeSpace",
"Minimum free space threshold (hard limit) enforced locally for writes, " +
"derived from hdds.datanode.volume.min.free.space.hard.limit.percent");
private static final MetricsInfo NON_OZONE_USED =
Interns.info("NonOzoneUsed",
"Space on the filesystem consumed by non-Ozone workloads " +
Expand Down Expand Up @@ -254,6 +258,7 @@ public void getMetrics(MetricsCollector collector, boolean all) {
.addGauge(FS_AVAILABLE, fsUsage.getAvailable())
.addGauge(FS_USED, fsUsage.getCapacity() - fsUsage.getAvailable())
.addGauge(MIN_FREE_SPACE, volume.getReportedFreeSpaceToSpare(ozoneCapacity))
.addGauge(HARD_MIN_FREE_SPACE, volume.getFreeSpaceToSpare(ozoneCapacity))
.addGauge(NON_OZONE_USED, VolumeUsage.getOtherUsed(fsUsage));
}
}
Expand Down
2 changes: 2 additions & 0 deletions hadoop-hdds/container-service/src/main/resources/webapps/hddsDatanode/dn-overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ <h2>Volume Information</h2>
<th>Filesystem Available</th>
<th>Filesystem Used</th>
<th>Min Free Space</th>
<th>Hard Min Free Space</th>
<th>Non-Ozone Used</th>
<th>Containers</th>
<th>State</th>
Expand All @@ -79,6 +80,7 @@ <h2>Volume Information</h2>
<td>{{volumeInfo.FilesystemAvailable}}</td>
<td>{{volumeInfo.FilesystemUsed}}</td>
<td>{{volumeInfo.MinFreeSpace}}</td>
<td>{{volumeInfo.HardMinFreeSpace}}</td>
<td>{{volumeInfo.NonOzoneUsed}}</td>
<td>{{volumeInfo.Containers}}</td>
<td>{{volumeInfo["tag.VolumeState"]}}</td>
Expand Down
1 change: 1 addition & 0 deletions hadoop-hdds/container-service/src/main/resources/webapps/hddsDatanode/dn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
volume.FilesystemAvailable = transform(volume.FilesystemAvailable);
volume.FilesystemUsed = transform(volume.FilesystemUsed);
volume.MinFreeSpace = transform(volume.MinFreeSpace);
volume.HardMinFreeSpace = transform(volume.HardMinFreeSpace);
volume.NonOzoneUsed = transform(volume.NonOzoneUsed);
})
});
Expand Down
2 changes: 2 additions & 0 deletions .../src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeInfoMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ void testVolumeInfoMetricsExposeOzoneAndFilesystemGauges() {
when(volume.getCommittedBytes()).thenReturn(10L);
when(volume.getContainers()).thenReturn(3L);
when(volume.getReportedFreeSpaceToSpare(anyLong())).thenReturn(20L);
when(volume.getFreeSpaceToSpare(anyLong())).thenReturn(15L);

VolumeUsage volumeUsage = mock(VolumeUsage.class);
when(volume.getVolumeUsage()).thenReturn(volumeUsage);
Expand Down Expand Up @@ -80,6 +81,7 @@ void testVolumeInfoMetricsExposeOzoneAndFilesystemGauges() {
assertThat(findMetric(all, "FilesystemUsed")).isEqualTo(900L); // FilesystemCapacity - FilesystemAvailable

assertThat(findMetric(all, "MinFreeSpace")).isEqualTo(20L);
assertThat(findMetric(all, "HardMinFreeSpace")).isEqualTo(15L);
// NonOzoneUsed = FilesystemUsed - OzoneUsed = 900 - 500
assertThat(findMetric(all, "NonOzoneUsed")).isEqualTo(400L);
} finally {
Expand Down