Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HDFS-13838. WebHdfsFileSystem.getFileStatus() won't return correct "snapshot enabled" status. Contributed by Siyao Meng." 

This reverts commit 26c2a97c56.
This commit is contained in:
Wei-Chiu Chuang 2018-08-30 11:44:20 -07:00
parent c36d69a7b3
commit 8aa6c4f079
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/JsonUtilClient.java
View File

@ -133,7 +133,6 @@ class JsonUtilClient {
Boolean aclBit = (Boolean) m.get("aclBit"); Boolean aclBit = (Boolean) m.get("aclBit");
Boolean encBit = (Boolean) m.get("encBit"); Boolean encBit = (Boolean) m.get("encBit");
Boolean erasureBit = (Boolean) m.get("ecBit"); Boolean erasureBit = (Boolean) m.get("ecBit");
Boolean snapshotEnabledBit = (Boolean) m.get("snapshotEnabled");
EnumSet<HdfsFileStatus.Flags> f = EnumSet<HdfsFileStatus.Flags> f =
EnumSet.noneOf(HdfsFileStatus.Flags.class); EnumSet.noneOf(HdfsFileStatus.Flags.class);
if (aclBit != null && aclBit) { if (aclBit != null && aclBit) {
@ -145,9 +144,6 @@ class JsonUtilClient {
if (erasureBit != null && erasureBit) { if (erasureBit != null && erasureBit) {
f.add(HdfsFileStatus.Flags.HAS_EC); f.add(HdfsFileStatus.Flags.HAS_EC);
} }
if (snapshotEnabledBit != null && snapshotEnabledBit) {
f.add(HdfsFileStatus.Flags.SNAPSHOT_ENABLED);
}
Map<String, Object> ecPolicyObj = (Map) m.get("ecPolicyObj"); Map<String, Object> ecPolicyObj = (Map) m.get("ecPolicyObj");
ErasureCodingPolicy ecPolicy = null; ErasureCodingPolicy ecPolicy = null;

12
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java
View File

@ -482,9 +482,6 @@ public class TestWebHDFS {
// allow snapshots on /bar using webhdfs // allow snapshots on /bar using webhdfs
webHdfs.allowSnapshot(bar); webHdfs.allowSnapshot(bar);
// check if snapshot status is enabled
assertTrue(dfs.getFileStatus(bar).isSnapshotEnabled());
assertTrue(webHdfs.getFileStatus(bar).isSnapshotEnabled());
webHdfs.createSnapshot(bar, "s1"); webHdfs.createSnapshot(bar, "s1");
final Path s1path = SnapshotTestHelper.getSnapshotRoot(bar, "s1"); final Path s1path = SnapshotTestHelper.getSnapshotRoot(bar, "s1");
Assert.assertTrue(webHdfs.exists(s1path)); Assert.assertTrue(webHdfs.exists(s1path));
@ -494,24 +491,15 @@ public class TestWebHDFS {
assertEquals(bar, snapshottableDirs[0].getFullPath()); assertEquals(bar, snapshottableDirs[0].getFullPath());
dfs.deleteSnapshot(bar, "s1"); dfs.deleteSnapshot(bar, "s1");
dfs.disallowSnapshot(bar); dfs.disallowSnapshot(bar);
// check if snapshot status is disabled
assertFalse(dfs.getFileStatus(bar).isSnapshotEnabled());
assertFalse(webHdfs.getFileStatus(bar).isSnapshotEnabled());
snapshottableDirs = dfs.getSnapshottableDirListing(); snapshottableDirs = dfs.getSnapshottableDirListing();
assertNull(snapshottableDirs); assertNull(snapshottableDirs);
// disallow snapshots on /bar using webhdfs // disallow snapshots on /bar using webhdfs
dfs.allowSnapshot(bar); dfs.allowSnapshot(bar);
// check if snapshot status is enabled, again
assertTrue(dfs.getFileStatus(bar).isSnapshotEnabled());
assertTrue(webHdfs.getFileStatus(bar).isSnapshotEnabled());
snapshottableDirs = dfs.getSnapshottableDirListing(); snapshottableDirs = dfs.getSnapshottableDirListing();
assertEquals(1, snapshottableDirs.length); assertEquals(1, snapshottableDirs.length);
assertEquals(bar, snapshottableDirs[0].getFullPath()); assertEquals(bar, snapshottableDirs[0].getFullPath());
webHdfs.disallowSnapshot(bar); webHdfs.disallowSnapshot(bar);
// check if snapshot status is disabled, again
assertFalse(dfs.getFileStatus(bar).isSnapshotEnabled());
assertFalse(webHdfs.getFileStatus(bar).isSnapshotEnabled());
snapshottableDirs = dfs.getSnapshottableDirListing(); snapshottableDirs = dfs.getSnapshottableDirListing();
assertNull(snapshottableDirs); assertNull(snapshottableDirs);
try { try {