This is an automated email from the ASF dual-hosted git repository.
inigoiri pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 130f89e HDFS-15332. Quota Space consumed was wrong in truncate with
Snapshots. Contributed by hemanthboyina.
130f89e is described below
commit 130f89e068ca346a44fa6619ae0726c1e5cc5d06
Author: Inigo Goiri <[email protected]>
AuthorDate: Wed May 6 13:18:32 2020 -0700
HDFS-15332. Quota Space consumed was wrong in truncate with Snapshots.
Contributed by hemanthboyina.
---
.../namenode/snapshot/FileWithSnapshotFeature.java | 6 ++++
.../hdfs/server/namenode/TestFileTruncate.java | 40 ++++++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileWithSnapshotFeature.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileWithSnapshotFeature.java
index 7fa7ce7..44c258c 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileWithSnapshotFeature.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileWithSnapshotFeature.java
@@ -163,6 +163,12 @@ public class FileWithSnapshotFeature implements
INode.Feature {
if (removed.getBlocks() != null) {
allBlocks.addAll(Arrays.asList(removed.getBlocks()));
}
+ for (FileDiff diff : diffs) {
+ BlockInfo[] diffBlocks = diff.getBlocks();
+ if (diffBlocks != null) {
+ allBlocks.addAll(Arrays.asList(diffBlocks));
+ }
+ }
for (BlockInfo b: allBlocks) {
short replication = b.getReplication();
long blockSize = b.isComplete() ? b.getNumBytes() : file
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java
index 5f789e8..7bfa8ae 100755
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java
@@ -1353,4 +1353,44 @@ public class TestFileTruncate {
fs.concat(trg, srcs);
assertEquals(1, fs.getContentSummary(new Path(dir)).getFileCount());
}
+
+ /**
+ * Test Quota space consumed with multiple snapshots.
+ */
+ @Test
+ public void testQuotaSpaceConsumedWithSnapshots() throws IOException {
+ Path root = new Path("/");
+ Path dir = new Path(root, "dir");
+ fs.mkdirs(dir);
+ fs.allowSnapshot(dir);
+
+ // create a file
+ Path file2 = new Path(dir, "file2");
+ DFSTestUtil.createFile(fs, file2, 30, (short) 1, 0);
+
+ // create a snapshot and truncate the file
+ fs.createSnapshot(dir, "s1");
+ boolean isReady = fs.truncate(file2, 20);
+ if (!isReady) {
+ checkBlockRecovery(file2);
+ }
+
+ // create one more snapshot and truncate the file which exists in previous
+ // snapshot
+ fs.createSnapshot(dir, "s2");
+ isReady = fs.truncate(file2, 10);
+ if (!isReady) {
+ checkBlockRecovery(file2);
+ }
+
+ // delete the snapshots and check quota space consumed usage
+ fs.deleteSnapshot(dir, "s1");
+ fs.deleteSnapshot(dir, "s2");
+ assertEquals(fs.getContentSummary(root).getSpaceConsumed(),
+ fs.getQuotaUsage(root).getSpaceConsumed());
+ fs.delete(dir, true);
+ assertEquals(fs.getContentSummary(root).getSpaceConsumed(),
+ fs.getQuotaUsage(root).getSpaceConsumed());
+
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
