Avoid NPE when router async rpc disable.

hfutatzhanghb · hfutatzhanghb · commit 306f2ea1f378 · 2025-03-14T14:34:04.000+08:00
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/fairness/RouterAsyncRpcFairnessPolicyController.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/fairness/RouterAsyncRpcFairnessPolicyController.java
@@ -25,6 +25,7 @@
 
 import java.util.Set;
 
+import static org.apache.hadoop.hdfs.server.federation.fairness.RouterRpcFairnessConstants.CONCURRENT_NS;
 import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.
     DFS_ROUTER_ASYNC_RPC_MAX_ASYNCCALL_PERMIT_KEY;
 import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.
@@ -61,6 +62,9 @@ public void init(Configuration conf) throws IllegalArgumentException {
       insertNameServiceWithPermits(nsId, maxAsyncCallPermit);
       logAssignment(nsId, maxAsyncCallPermit);
     }
+    // Avoid NPE when router async rpc disable.
+    insertNameServiceWithPermits(CONCURRENT_NS, maxAsyncCallPermit);
+    LOG.info("Dedicated permits {} for ns {} ", maxAsyncCallPermit, CONCURRENT_NS);
   }
 
   private static void logAssignment(String nsId, int count) {

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`
`26`	`26`	`import java.util.Set;`
`27`	`27`
	`28`	`+import static org.apache.hadoop.hdfs.server.federation.fairness.RouterRpcFairnessConstants.CONCURRENT_NS;`
`28`	`29`	`import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.`
`29`	`30`	`DFS_ROUTER_ASYNC_RPC_MAX_ASYNCCALL_PERMIT_KEY;`
`30`	`31`	`import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.`
`@@ -61,6 +62,9 @@ public void init(Configuration conf) throws IllegalArgumentException {`
`61`	`62`	`insertNameServiceWithPermits(nsId, maxAsyncCallPermit);`
`62`	`63`	`logAssignment(nsId, maxAsyncCallPermit);`
`63`	`64`	`}`
	`65`	`+ // Avoid NPE when router async rpc disable.`
	`66`	`+ insertNameServiceWithPermits(CONCURRENT_NS, maxAsyncCallPermit);`
	`67`	`+ LOG.info("Dedicated permits {} for ns {} ", maxAsyncCallPermit, CONCURRENT_NS);`
`64`	`68`	`}`
`65`	`69`
`66`	`70`	`private static void logAssignment(String nsId, int count) {`