Repository: hadoop Updated Branches: refs/heads/branch-2 8d3657a57 -> b76c321e9
HDFS-5215. dfs.datanode.du.reserved is not considered while computing available space ( Brahma Reddy Battula via Yongjun Zhang) (cherry picked from commit 66763bb06f107f0e072c773a5feb25903c688ddc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b76c321e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b76c321e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b76c321e Branch: refs/heads/branch-2 Commit: b76c321e94d99659a166659d827b922e04363179 Parents: 8d3657a Author: Yongjun Zhang <[email protected]> Authored: Tue Apr 7 19:31:58 2015 -0700 Committer: Yongjun Zhang <[email protected]> Committed: Tue Apr 7 19:36:02 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../datanode/fsdataset/impl/FsDatasetImpl.java | 6 +++--- .../datanode/fsdataset/impl/FsVolumeImpl.java | 16 ++++++++++++---- 3 files changed, 18 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b76c321e/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 16002a6..672ac80 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -106,6 +106,9 @@ Release 2.8.0 - UNRELEASED HDFS-7916. 'reportBadBlocks' from datanodes to standby Node BPServiceActor goes for infinite loop (vinayakumarb) + HDFS-5215. dfs.datanode.du.reserved is not considered while computing + available space ( Brahma Reddy Battula via Yongjun Zhang) + Release 2.7.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/b76c321e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java index 6af7d92..ce0ba36 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java @@ -2494,9 +2494,9 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> { */ private static class VolumeInfo { final String directory; - final long usedSpace; - final long freeSpace; - final long reservedSpace; + final long usedSpace; // size of space used by HDFS + final long freeSpace; // size of free space excluding reserved space + final long reservedSpace; // size of space reserved for non-HDFS and RBW VolumeInfo(FsVolumeImpl v, long usedSpace, long freeSpace) { this.directory = v.toString(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/b76c321e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java index 9b0d40f..e80c174 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java @@ -305,9 +305,11 @@ public class FsVolumeImpl implements FsVolumeSpi { } /** - * Calculate the capacity of the filesystem, after removing any - * reserved capacity. - * @return the unreserved number of bytes left in this filesystem. May be zero. + * Return either the configured capacity of the file system if configured; or + * the capacity of the file system excluding space reserved for non-HDFS. + * + * @return the unreserved number of bytes left in this filesystem. May be + * zero. */ @VisibleForTesting public long getCapacity() { @@ -329,10 +331,16 @@ public class FsVolumeImpl implements FsVolumeSpi { this.configuredCapacity = capacity; } + /* + * Calculate the available space of the filesystem, excluding space reserved + * for non-HDFS and space reserved for RBW + * + * @return the available number of bytes left in this filesystem. May be zero. + */ @Override public long getAvailable() throws IOException { long remaining = getCapacity() - getDfsUsed() - reservedForRbw.get(); - long available = usage.getAvailable(); + long available = usage.getAvailable() - reserved - reservedForRbw.get(); if (remaining > available) { remaining = available; }
