tmp save

apache · Mar 4, 2025 · 5dce065 · 5dce065
1 parent 31d29e5
commit 5dce065
Show file tree

Hide file tree

Showing 14 changed files with 1,923 additions and 81 deletions.
diff --git a/...doop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/protocolPB/AsyncRpcProtocolPBUtil.java b/...doop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/protocolPB/AsyncRpcProtocolPBUtil.java
@@ -125,6 +125,7 @@ public static <T> void asyncRouterServer(ServerReq<T> req, ServerRes<T> res) {
       LOG.debug("Async response, callback: {}, CallerContext: {}, result: [{}], exception: [{}]",
           callback, CallerContext.getCurrent(), result, e);
       if (e == null) {
+        LOG.info("BZL#Test. asyncRouterServer. excep == null.");
         Message value = null;
         try {
           value = res.res(result);
@@ -134,6 +135,7 @@ public static <T> void asyncRouterServer(ServerReq<T> req, ServerRes<T> res) {
         }
         callback.setResponse(value);
       } else {
+        LOG.info("BZL#Test. asyncRouterServer. excep != null.");
         callback.error(e.getCause());
       }
       return null;

diff --git a/...f/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterClientProtocol.java b/...f/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterClientProtocol.java
@@ -2225,7 +2225,7 @@ protected static FsPermission getParentPermission(final FsPermission mask) {
    * @return New HDFS file status representing a mount point.
    */
   @VisibleForTesting
-  protected HdfsFileStatus getMountPointStatus(
+  public HdfsFileStatus getMountPointStatus(
       String name, int childrenNum, long date) {
     return getMountPointStatus(name, childrenNum, date, true);
   }
@@ -2240,7 +2240,7 @@ protected HdfsFileStatus getMountPointStatus(
    * @return New HDFS file status representing a mount point.
    */
   @VisibleForTesting
-  protected HdfsFileStatus getMountPointStatus(
+  public HdfsFileStatus getMountPointStatus(
       String name, int childrenNum, long date, boolean setPath) {
     long modTime = date;
     long accessTime = date;

diff --git a/...fs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcClient.java b/...fs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcClient.java
@@ -1994,7 +1994,7 @@ private static boolean isReadCall(Method method) {
    * @param nsId namespaceID
    */
   @VisibleForTesting
-  boolean isNamespaceStateIdFresh(String nsId) {
+  public boolean isNamespaceStateIdFresh(String nsId) {
     if (activeNNStateIdRefreshPeriodMs < 0) {
       return true;
     }

diff --git a/...f/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterStateIdContext.java b/...f/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterStateIdContext.java
@@ -64,7 +64,7 @@ public class RouterStateIdContext implements AlignmentContext {
   /** Nameservice specific overrides of the default setting for enabling observer reads. */
   private HashSet<String> observerReadEnabledOverrides = new HashSet<>();
 
-  RouterStateIdContext(Configuration conf) {
+  public RouterStateIdContext(Configuration conf) {
     this.coordinatedMethods = new HashSet<>();
     // For now, only ClientProtocol methods can be coordinated, so only checking
     // against ClientProtocol.

diff --git a/...f/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterWebHdfsMethods.java b/...f/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterWebHdfsMethods.java
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hdfs.server.federation.router;
 
+import static org.apache.hadoop.hdfs.server.federation.router.async.utils.AsyncUtil.syncReturn;
 import static org.apache.hadoop.util.StringUtils.getTrimmedStringCollection;
 
 import org.apache.hadoop.fs.InvalidPathException;
@@ -28,6 +29,7 @@
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
 import org.apache.hadoop.hdfs.protocol.HdfsConstants.DatanodeReportType;
 import org.apache.hadoop.hdfs.server.common.JspHelper;
+import org.apache.hadoop.hdfs.server.federation.resolver.RemoteLocation;
 import org.apache.hadoop.hdfs.server.federation.router.security.RouterSecurityManager;
 import org.apache.hadoop.hdfs.server.namenode.web.resources.NamenodeWebHdfsMethods;
 
@@ -478,8 +480,14 @@ private DatanodeInfo chooseDatanode(final Router router,
 
     if (op == PutOpParam.Op.CREATE) {
       try {
-        resolvedNs = rpcServer.getCreateLocation(path).getNameserviceId();
-      } catch (IOException e) {
+        if (rpcServer.isAsync()) {
+          rpcServer.getCreateLocation(path);
+          RemoteLocation remoteLocation = syncReturn(RemoteLocation.class);
+          resolvedNs = remoteLocation.getNameserviceId();
+        } else {
+          resolvedNs = rpcServer.getCreateLocation(path).getNameserviceId();
+        }
+      } catch (Exception e) {
         LOG.error("Cannot get the name service " +
             "to create file for path {} ", path, e);
       }