Skip to content

Commit fe5b01f

Browse files
committed
fix some failed unit tests.
1 parent e2967c0 commit fe5b01f

File tree

1 file changed

+10
-1
lines changed
  • hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router

1 file changed

+10
-1
lines changed

hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcClient.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_IP_PROXY_USERS;
2626
import static org.apache.hadoop.hdfs.server.federation.fairness.RouterRpcFairnessConstants.CONCURRENT_NS;
2727
import static org.apache.hadoop.hdfs.server.federation.metrics.FederationRPCPerformanceMonitor.CONCURRENT;
28+
import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_ASYNC_RPC_ENABLE_DEFAULT;
29+
import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_ASYNC_RPC_ENABLE_KEY;
2830

2931
import java.io.EOFException;
3032
import java.io.FileNotFoundException;
@@ -200,7 +202,7 @@ public RouterRpcClient(Configuration conf, Router router,
200202
workQueue = new LinkedBlockingQueue<>();
201203
}
202204

203-
if (router.getRpcServer().isAsync()) {
205+
if (isAsync()) {
204206
this.executorService = null;
205207
} else {
206208
this.executorService = new ThreadPoolExecutor(numThreads, numThreads,
@@ -2033,6 +2035,13 @@ protected boolean shouldRotateCache(IOException ioe) {
20332035
}
20342036
return isUnavailableException(ioe);
20352037
}
2038+
2039+
@VisibleForTesting
2040+
private boolean isAsync() {
2041+
return router.getRpcServer() != null ? router.getRpcServer().isAsync() :
2042+
router.getConfig().getBoolean(DFS_ROUTER_ASYNC_RPC_ENABLE_KEY,
2043+
DFS_ROUTER_ASYNC_RPC_ENABLE_DEFAULT);
2044+
}
20362045

20372046

20382047
/**

0 commit comments

Comments
 (0)