Use getUsableSpace() in DiskSpaceHealthIndicator

See gh-9544
pull/9585/head
Huang YunKun 8 years ago committed by Stephane Nicoll
parent 3ead213c7d
commit 158416fdd0

@ -46,7 +46,7 @@ public class DiskSpaceHealthIndicator extends AbstractHealthIndicator {
@Override @Override
protected void doHealthCheck(Health.Builder builder) throws Exception { protected void doHealthCheck(Health.Builder builder) throws Exception {
File path = this.properties.getPath(); File path = this.properties.getPath();
long diskFreeInBytes = path.getFreeSpace(); long diskFreeInBytes = path.getUsableSpace();
if (diskFreeInBytes >= this.properties.getThreshold()) { if (diskFreeInBytes >= this.properties.getThreshold()) {
builder.up(); builder.up();
} }

@ -56,7 +56,7 @@ public class DiskSpaceHealthIndicatorTests {
@Test @Test
public void diskSpaceIsUp() throws Exception { public void diskSpaceIsUp() throws Exception {
given(this.fileMock.getFreeSpace()).willReturn(THRESHOLD_BYTES + 10); given(this.fileMock.getUsableSpace()).willReturn(THRESHOLD_BYTES + 10);
given(this.fileMock.getTotalSpace()).willReturn(THRESHOLD_BYTES * 10); given(this.fileMock.getTotalSpace()).willReturn(THRESHOLD_BYTES * 10);
Health health = this.healthIndicator.health(); Health health = this.healthIndicator.health();
assertThat(health.getStatus()).isEqualTo(Status.UP); assertThat(health.getStatus()).isEqualTo(Status.UP);
@ -67,7 +67,7 @@ public class DiskSpaceHealthIndicatorTests {
@Test @Test
public void diskSpaceIsDown() throws Exception { public void diskSpaceIsDown() throws Exception {
given(this.fileMock.getFreeSpace()).willReturn(THRESHOLD_BYTES - 10); given(this.fileMock.getUsableSpace()).willReturn(THRESHOLD_BYTES - 10);
given(this.fileMock.getTotalSpace()).willReturn(THRESHOLD_BYTES * 10); given(this.fileMock.getTotalSpace()).willReturn(THRESHOLD_BYTES * 10);
Health health = this.healthIndicator.health(); Health health = this.healthIndicator.health();
assertThat(health.getStatus()).isEqualTo(Status.DOWN); assertThat(health.getStatus()).isEqualTo(Status.DOWN);

Loading…
Cancel
Save