HDFS-16693. RBF: fix NPE in Quota

weixiaoxing3 · weixiaoxing3 · commit 2ba93be85994 · 2022-07-26T21:29:32.000+08:00
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Quota.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Quota.java
@@ -204,7 +204,8 @@ QuotaUsage getGlobalQuota(String path) throws IOException {
    * @return {@code true} if path is a mount entry; {@code false} otherwise.
    */
   private boolean isMountEntry(String path) {
-    return router.getQuotaManager().isMountEntry(path);
+    return router.isQuotaEnabled() &&
+        router.getQuotaManager().isMountEntry(path);
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,8 @@ QuotaUsage getGlobalQuota(String path) throws IOException {`
`204`	`204`	`* @return {@code true} if path is a mount entry; {@code false} otherwise.`
`205`	`205`	`*/`
`206`	`206`	`private boolean isMountEntry(String path) {`
`207`		`- return router.getQuotaManager().isMountEntry(path);`
	`207`	`+ return router.isQuotaEnabled() &&`
	`208`	`+ router.getQuotaManager().isMountEntry(path);`
`208`	`209`	`}`
`209`	`210`
`210`	`211`	`/**`