Skip to content

S
spring-boot
Commit 158416fd authored by Huang YunKun's avatar Huang YunKun Committed by Stephane Nicoll
Browse files
Options

Use getUsableSpace() in DiskSpaceHealthIndicator 

See gh-9544
parent 3ead213c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java
View file @ 158416fd
...@@ -46,7 +46,7 @@ public class DiskSpaceHealthIndicator extends AbstractHealthIndicator { ...@@ -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();
} }
......
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicatorTests.java
View file @ 158416fd
...@@ -56,7 +56,7 @@ public class DiskSpaceHealthIndicatorTests { ...@@ -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 { ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment