You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by we...@apache.org on 2019/08/02 00:14:15 UTC
[hadoop] branch trunk updated: HDFS-14683. WebHDFS: Add
erasureCodingPolicy field to GETCONTENTSUMMARY response (#1189) Contributed
by Siyao Meng.
This is an automated email from the ASF dual-hosted git repository.
weichiu 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 99bf1dc HDFS-14683. WebHDFS: Add erasureCodingPolicy field to GETCONTENTSUMMARY response (#1189) Contributed by Siyao Meng.
99bf1dc is described below
commit 99bf1dc9eb18f9b4d0338986d1b8fd2232f1232f
Author: Siyao Meng <50...@users.noreply.github.com>
AuthorDate: Thu Aug 1 17:14:07 2019 -0700
HDFS-14683. WebHDFS: Add erasureCodingPolicy field to GETCONTENTSUMMARY response (#1189) Contributed by Siyao Meng.
---
.../java/org/apache/hadoop/hdfs/web/JsonUtil.java | 1 +
.../hadoop-hdfs/src/site/markdown/WebHDFS.md | 1 +
.../org/apache/hadoop/hdfs/web/TestJsonUtil.java | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
index 58a18d2..0e8638d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
@@ -354,6 +354,7 @@ public class JsonUtil {
m.put("length", contentsummary.getLength());
m.put("fileCount", contentsummary.getFileCount());
m.put("directoryCount", contentsummary.getDirectoryCount());
+ m.put("ecPolicy", contentsummary.getErasureCodingPolicy());
// For ContentSummary we don't need this since we already have
// separate count for file and directory.
m.putAll(toJsonMap(contentsummary, false));
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md
index 00bb704..8afb7af 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md
@@ -761,6 +761,7 @@ Other File System Operations
"ContentSummary":
{
"directoryCount": 2,
+ "ecPolicy" : "RS-6-3-1024k",
"fileCount" : 1,
"length" : 24930,
"quota" : -1,
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestJsonUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestJsonUtil.java
index e1dc271..3ffc35f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestJsonUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestJsonUtil.java
@@ -34,6 +34,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.XAttr;
import org.apache.hadoop.fs.XAttrCodec;
+import org.apache.hadoop.fs.ContentSummary;
import org.apache.hadoop.fs.permission.AclEntry;
import org.apache.hadoop.fs.permission.AclStatus;
import org.apache.hadoop.fs.permission.FsPermission;
@@ -256,6 +257,26 @@ public class TestJsonUtil {
JsonUtil.toJsonString(aclStatusBuilder.build()));
}
+
+ @Test
+ public void testToJsonFromContentSummary() {
+ String jsonString =
+ "{\"ContentSummary\":{\"directoryCount\":33333,\"ecPolicy\":\"RS-6-3-1024k\",\"fileCount\":22222,\"length\":11111,\"quota\":44444,\"spaceConsumed\":55555,\"spaceQuota\":66666,\"typeQuota\":{}}}";
+ long length = 11111;
+ long fileCount = 22222;
+ long directoryCount = 33333;
+ long quota = 44444;
+ long spaceConsumed = 55555;
+ long spaceQuota = 66666;
+ String ecPolicy = "RS-6-3-1024k";
+
+ ContentSummary contentSummary = new ContentSummary.Builder().length(length).
+ fileCount(fileCount).directoryCount(directoryCount).quota(quota).
+ spaceConsumed(spaceConsumed).spaceQuota(spaceQuota).
+ erasureCodingPolicy(ecPolicy).build();
+
+ Assert.assertEquals(jsonString, JsonUtil.toJsonString(contentSummary));
+ }
@Test
public void testToJsonFromXAttrs() throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org