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 2018/08/14 00:36:58 UTC
hadoop git commit: HDFS-13738. fsck -list-corruptfileblocks has
infinite loop if user is not privileged. Contributed by Yuen-Kuei Hsueh.
Repository: hadoop
Updated Branches:
refs/heads/trunk 23854443e -> 4023eeba0
HDFS-13738. fsck -list-corruptfileblocks has infinite loop if user is not privileged. Contributed by Yuen-Kuei Hsueh.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4023eeba
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4023eeba
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4023eeba
Branch: refs/heads/trunk
Commit: 4023eeba05aefe48384e870da3c95bb3af474514
Parents: 2385444
Author: Wei-Chiu Chuang <we...@apache.org>
Authored: Mon Aug 13 17:36:13 2018 -0700
Committer: Wei-Chiu Chuang <we...@apache.org>
Committed: Mon Aug 13 17:36:13 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hdfs/tools/DFSck.java | 6 ++++++
.../hadoop/hdfs/server/namenode/TestFsck.java | 18 ++++++++++++++++++
2 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4023eeba/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
index 10b0012..3171497 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
@@ -210,8 +210,14 @@ public class DFSck extends Configured implements Tool {
allDone = true;
break;
}
+ if (line.startsWith("Access denied for user")) {
+ out.println("Failed to open path '" + dir + "': Permission denied");
+ errCode = -1;
+ return errCode;
+ }
if ((line.isEmpty())
|| (line.startsWith("FSCK started by"))
+ || (line.startsWith("FSCK ended at"))
|| (line.startsWith("The filesystem under path")))
continue;
numCorrupt++;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4023eeba/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
index 1a392da..d95c2be 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
@@ -2488,4 +2488,22 @@ public class TestFsck {
runFsck(cluster.getConfiguration(0), 0, true, "/");
}
}
+
+ @Test
+ public void testFsckNonPrivilegedListCorrupt() throws Exception {
+ cluster = new MiniDFSCluster.Builder(conf).numDataNodes(4).build();
+ UserGroupInformation ugi = UserGroupInformation.createUserForTesting("systest", new String[]{""});
+ ugi.doAs(new PrivilegedExceptionAction<Void>() {
+ @Override
+ public Void run() throws Exception {
+ String path = "/";
+ String outStr = runFsck(conf, -1, true, path, "-list-corruptfileblocks");
+
+ assertFalse(outStr.contains("The list of corrupt files under path '" + path + "' are:"));
+ assertFalse(outStr.contains("The filesystem under path '" + path + "' has "));
+ assertTrue(outStr.contains("Failed to open path '" + path + "': Permission denied"));
+ return null;
+ }
+ });
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org