HDFS-17031. Reduce some repeated codes in RouterRpcServer. (#5701). Contributed by Chengwei Wang.
Reviewed-by: Inigo Goiri <inigoiri@apache.org>
Reviewed-by: Simbarashe Dzinamarira <sdzinamarira@linkedin.com>
Signed-off-by: Ayush Saxena <ayushsaxena@apache.org>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
index 9d4c2ca..1c3a28a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
@@ -1830,18 +1830,8 @@
* @return If the path is in a read only mount point.
*/
private boolean isPathReadOnly(final String path) {
- if (subclusterResolver instanceof MountTableResolver) {
- try {
- MountTableResolver mountTable = (MountTableResolver)subclusterResolver;
- MountTable entry = mountTable.getMountPoint(path);
- if (entry != null && entry.isReadOnly()) {
- return true;
- }
- } catch (IOException e) {
- LOG.error("Cannot get mount point", e);
- }
- }
- return false;
+ MountTable entry = getMountTable(path);
+ return entry != null && entry.isReadOnly();
}
/**
@@ -1940,18 +1930,8 @@
* @return If a path should be in all subclusters.
*/
boolean isPathAll(final String path) {
- if (subclusterResolver instanceof MountTableResolver) {
- try {
- MountTableResolver mountTable = (MountTableResolver) subclusterResolver;
- MountTable entry = mountTable.getMountPoint(path);
- if (entry != null) {
- return entry.isAll();
- }
- } catch (IOException e) {
- LOG.error("Cannot get mount point", e);
- }
- }
- return false;
+ MountTable entry = getMountTable(path);
+ return entry != null && entry.isAll();
}
/**
@@ -1961,18 +1941,20 @@
* @return If a path should support failed subclusters.
*/
boolean isPathFaultTolerant(final String path) {
+ MountTable entry = getMountTable(path);
+ return entry != null && entry.isFaultTolerant();
+ }
+
+ private MountTable getMountTable(final String path){
if (subclusterResolver instanceof MountTableResolver) {
try {
MountTableResolver mountTable = (MountTableResolver) subclusterResolver;
- MountTable entry = mountTable.getMountPoint(path);
- if (entry != null) {
- return entry.isFaultTolerant();
- }
+ return mountTable.getMountPoint(path);
} catch (IOException e) {
LOG.error("Cannot get mount point", e);
}
}
- return false;
+ return null;
}
/**
