瀏覽代碼

HDFS-10417. Improve error message from checkBlockLocalPathAccess. Contributed by Tianyin Xu.

Kihwal Lee 9 年之前
父節點
當前提交
204de430bf

+ 2 - 1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

@@ -1717,7 +1717,8 @@ public class DataNode extends ReconfigurableBase
       throw new AccessControlException(
       throw new AccessControlException(
           "Can't continue with getBlockLocalPathInfo() "
           "Can't continue with getBlockLocalPathInfo() "
               + "authorization. The user " + currentUser
               + "authorization. The user " + currentUser
-              + " is not allowed to call getBlockLocalPathInfo");
+              + " is not configured in "
+              + DFSConfigKeys.DFS_BLOCK_LOCAL_PATH_ACCESS_USER_KEY);
     }
     }
   }
   }
 
 

+ 4 - 2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java

@@ -375,10 +375,12 @@ public class TestShortCircuitLocalRead {
       try {
       try {
         proxy.getBlockLocalPathInfo(blk, token);
         proxy.getBlockLocalPathInfo(blk, token);
         Assert.fail("The call should have failed as this user "
         Assert.fail("The call should have failed as this user "
-            + " is not allowed to call getBlockLocalPathInfo");
+            + " is not configured in "
+            + DFSConfigKeys.DFS_BLOCK_LOCAL_PATH_ACCESS_USER_KEY);
       } catch (IOException ex) {
       } catch (IOException ex) {
         Assert.assertTrue(ex.getMessage().contains(
         Assert.assertTrue(ex.getMessage().contains(
-            "not allowed to call getBlockLocalPathInfo"));
+            "not configured in "
+            + DFSConfigKeys.DFS_BLOCK_LOCAL_PATH_ACCESS_USER_KEY));
       }
       }
     } finally {
     } finally {
       fs.close();
       fs.close();