Merge branch 'apache:trunk' into HDFS-17339

Author: ThinkerLei

dev-support/docker/pkg-resolver/install-maven.sh

@@ -40,7 +40,7 @@ fi
 
 if [ "$version_to_install" == "3.6.3" ]; then
   mkdir -p /opt/maven /tmp/maven &&
-    curl -L -s -S https://dlcdn.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz \
+    curl -L -s -S https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.tar.gz \
       -o /tmp/maven/apache-maven-3.6.3-bin.tar.gz &&
     tar xzf /tmp/maven/apache-maven-3.6.3-bin.tar.gz --strip-components 1 -C /opt/maven
 else

hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RegistrationClient.java renamed to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/oncrpc/RegistrationClient.java

@@ -86,7 +86,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
     }
 
     private void handle(RpcDeniedReply deniedReply) {
-      LOG.warn("Portmap mapping registration request was denied , " + 
+      LOG.warn("Portmap mapping registration request was denied , " +
           deniedReply);
     }
 

hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcAcceptedReply.java renamed to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/oncrpc/RpcAcceptedReply.java

@@ -19,7 +19,7 @@
 
 import org.apache.hadoop.oncrpc.security.Verifier;
 
-/** 
+/**
  * Represents RPC message MSG_ACCEPTED reply body. See RFC 1831 for details.
  * This response is sent to a request to indicate success of the request.
  */
@@ -32,7 +32,7 @@ public enum AcceptState {
     PROC_UNAVAIL, /* program can't support procedure */
     GARBAGE_ARGS, /* procedure can't decode params */
     SYSTEM_ERR; /* e.g. memory allocation failure */
-    
+
     public static AcceptState fromValue(int value) {
       return values()[value];
     }
@@ -41,12 +41,12 @@ public int getValue() {
       return ordinal();
     }
   };
-  
-  public static RpcAcceptedReply getAcceptInstance(int xid, 
+
+  public static RpcAcceptedReply getAcceptInstance(int xid,
       Verifier verifier) {
     return getInstance(xid, AcceptState.SUCCESS, verifier);
   }
-  
+
   public static RpcAcceptedReply getInstance(int xid, AcceptState state,
       Verifier verifier) {
     return new RpcAcceptedReply(xid, ReplyState.MSG_ACCEPTED, verifier,
@@ -70,7 +70,7 @@ public static RpcAcceptedReply read(int xid, ReplyState replyState, XDR xdr) {
   public AcceptState getAcceptState() {
     return acceptState;
   }
-  
+
   @Override
   public XDR write(XDR xdr) {
     xdr.writeInt(xid);

hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCall.java renamed to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/oncrpc/RpcCall.java

@@ -31,17 +31,17 @@ public class RpcCall extends RpcMessage {
 
   public static RpcCall read(XDR xdr) {
     return new RpcCall(xdr.readInt(), RpcMessage.Type.fromValue(xdr.readInt()),
-        xdr.readInt(), xdr.readInt(), xdr.readInt(), xdr.readInt(), 
+        xdr.readInt(), xdr.readInt(), xdr.readInt(), xdr.readInt(),
         Credentials.readFlavorAndCredentials(xdr),
         Verifier.readFlavorAndVerifier(xdr));
   }
-  
+
   public static RpcCall getInstance(int xid, int program, int version,
       int procedure, Credentials cred, Verifier verifier) {
     return new RpcCall(xid, RpcMessage.Type.RPC_CALL, 2, program, version,
         procedure, cred, verifier);
   }
-  
+
   private final int rpcVersion;
   private final int program;
   private final int version;
@@ -64,14 +64,14 @@ protected RpcCall(int xid, RpcMessage.Type messageType, int rpcVersion,
     }
     validate();
   }
-  
+
   private void validateRpcVersion() {
     if (rpcVersion != RPC_VERSION) {
       throw new IllegalArgumentException("RPC version is expected to be "
           + RPC_VERSION + " but got " + rpcVersion);
     }
   }
-  
+
   public void validate() {
     validateMessageType(RpcMessage.Type.RPC_CALL);
     validateRpcVersion();
@@ -95,15 +95,15 @@ public int getVersion() {
   public int getProcedure() {
     return procedure;
   }
-  
+
   public Credentials getCredential() {
     return credentials;
   }
 
   public Verifier getVerifier() {
     return verifier;
   }
-  
+
   @Override
   public XDR write(XDR xdr) {
     xdr.writeInt(xid);
@@ -116,7 +116,7 @@ public XDR write(XDR xdr) {
     Verifier.writeFlavorAndVerifier(verifier, xdr);
     return xdr;
   }
-  
+
   @Override
   public String toString() {
     return String.format("Xid:%d, messageType:%s, rpcVersion:%d, program:%d,"

hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCallCache.java renamed to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/oncrpc/RpcCallCache.java

@@ -39,34 +39,34 @@
  * <br>
  * A request is identified by the client ID (address of the client) and
  * transaction ID (xid) from the Rpc call.
- * 
+ *
  */
 public class RpcCallCache {
-  
+
   public static class CacheEntry {
     private RpcResponse response; // null if no response has been sent
-    
+
     public CacheEntry() {
       response = null;
     }
-      
+
     public boolean isInProgress() {
       return response == null;
     }
-    
+
     public boolean isCompleted() {
       return response != null;
     }
-    
+
     public RpcResponse getResponse() {
       return response;
     }
-    
+
     public void setResponse(RpcResponse response) {
       this.response = response;
     }
   }
-  
+
   /**
    * Call that is used to track a client in the {@link RpcCallCache}
    */
@@ -85,9 +85,9 @@ public ClientRequest(InetAddress clientId, int xid) {
 
     @Override
     public int hashCode() {
-	  return xid + clientId.hashCode() * 31;
+      return xid + clientId.hashCode() * 31;
     }
-    
+
     @Override
     public boolean equals(Object obj) {
       if (this == obj) {
@@ -100,11 +100,11 @@ public boolean equals(Object obj) {
       return clientId.equals(other.clientId) && (xid == other.xid);
     }
   }
-  
+
   private final String program;
-  
+
   private final Map<ClientRequest, CacheEntry> map;
-  
+
   public RpcCallCache(final String program, final int maxEntries) {
     if (maxEntries <= 0) {
       throw new IllegalArgumentException("Cache size is " + maxEntries
@@ -121,7 +121,7 @@ protected boolean removeEldestEntry(
       }
     };
   }
-  
+
   /**
    * Return the program name.
    * @return RPC program name
@@ -144,7 +144,7 @@ public void callCompleted(InetAddress clientId, int xid, RpcResponse response) {
     }
     e.response = response;
   }
-  
+
   /**
    * Check the cache for an entry. If it does not exist, add the request
    * as in progress.
@@ -164,16 +164,16 @@ public CacheEntry checkOrAddToCache(InetAddress clientId, int xid) {
     }
     return e;
   }
-  
+
   /**
    * Return number of cached entries.
    * @return cache size
    */
   public int size() {
     return map.size();
   }
-  
-  /** 
+
+  /**
    * Iterator to the cache entries.
    * @return iterator cache iterator
    */

hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcDeniedReply.java renamed to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/oncrpc/RpcDeniedReply.java

@@ -19,7 +19,7 @@
 
 import org.apache.hadoop.oncrpc.security.Verifier;
 
-/** 
+/**
  * Represents RPC message MSG_DENIED reply body. See RFC 1831 for details.
  * This response is sent to a request to indicate failure of the request.
  */
@@ -55,15 +55,15 @@ public static RpcDeniedReply read(int xid, ReplyState replyState, XDR xdr) {
   public RejectState getRejectState() {
     return rejectState;
   }
-  
+
   @Override
   public String toString() {
     return new StringBuffer().append("xid:").append(xid)
         .append(",messageType:").append(messageType).append("verifier_flavor:")
         .append(verifier.getFlavor()).append("rejectState:")
         .append(rejectState).toString();
   }
-  
+
   @Override
   public XDR write(XDR xdr) {
     xdr.writeInt(xid);

hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcInfo.java renamed to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/oncrpc/RpcInfo.java

@@ -26,7 +26,7 @@ public enum Type {
     // the order of the values below are significant.
     RPC_CALL,
     RPC_REPLY;
-    
+
     public int getValue() {
       return ordinal();
     }
@@ -41,25 +41,25 @@ public static Type fromValue(int value) {
 
   protected final int xid;
   protected final Type messageType;
-  
+
   RpcMessage(int xid, Type messageType) {
     if (messageType != Type.RPC_CALL && messageType != Type.RPC_REPLY) {
       throw new IllegalArgumentException("Invalid message type " + messageType);
     }
     this.xid = xid;
     this.messageType = messageType;
   }
-  
+
   public abstract XDR write(XDR xdr);
-  
+
   public int getXid() {
     return xid;
   }
 
   public Type getMessageType() {
     return messageType;
   }
-  
+
   protected void validateMessageType(Type expected) {
     if (expected != messageType) {
       throw new IllegalArgumentException("Message type is expected to be "