Skip to content

HDDS-5380. Get more accurate space info for DedicatedDiskSpaceUsage. #2365

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
ChenSammi merged 1 commit into from
Jun 28, 2021
Merged

HDDS-5380. Get more accurate space info for DedicatedDiskSpaceUsage. #2365

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
7 changes: 6 additions & 1 deletion hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/AbstractSpaceUsageSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,14 @@ public String toString() {
return path;
}

/**
* Get available space, excluding system reserved space.
* See {@link File#getUsableSpace()} and {@link File#getFreeSpace()}.
* @return available space for data
*/
@Override
public long getAvailable() {
return file.getFreeSpace();
return file.getUsableSpace();
}

@Override
Expand Down
8 changes: 7 additions & 1 deletion hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/DedicatedDiskSpaceUsage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,14 @@ public long getUsedSpace() {
return time(this::calculateUsedSpace, LOG);
}

/**
* Calculate used space, all free space are counted out.
* Some space may not be used by us, but reserved for system usage.
* See {@link File#getUsableSpace()} and {@link File#getFreeSpace()}.
* @return used space
*/
private long calculateUsedSpace() {
return getCapacity() - getAvailable();
return getCapacity() - getFile().getFreeSpace();
}

}