This is an automated email from the ASF dual-hosted git repository.
tasanuma pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new f26a547 HADOOP-17858. Avoid possible class loading deadlock with
VerifierNone initialization (#3321)
f26a547 is described below
commit f26a547f2bb21ca89ffadc6375da4cb0a4a2cec0
Author: Viraj Jasani <[email protected]>
AuthorDate: Tue Aug 24 19:11:59 2021 +0530
HADOOP-17858. Avoid possible class loading deadlock with VerifierNone
initialization (#3321)
(cherry picked from commit fc566ad9b0e1336381c5f6b321cdcff81768f47a)
---
.../hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java | 3 +--
.../src/main/java/org/apache/hadoop/oncrpc/security/Verifier.java | 2 --
.../src/main/java/org/apache/hadoop/oncrpc/security/VerifierNone.java | 2 ++
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git
a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java
b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java
index 5c059aa..194336a 100644
---
a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java
+++
b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java
@@ -24,7 +24,6 @@ import java.net.SocketAddress;
import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.oncrpc.RpcAcceptedReply.AcceptState;
-import org.apache.hadoop.oncrpc.security.Verifier;
import org.apache.hadoop.oncrpc.security.VerifierNone;
import org.apache.hadoop.portmap.PortmapMapping;
import org.apache.hadoop.portmap.PortmapRequest;
@@ -214,7 +213,7 @@ public abstract class RpcProgram extends
SimpleChannelUpstreamHandler {
private void sendAcceptedReply(RpcCall call, SocketAddress remoteAddress,
AcceptState acceptState, ChannelHandlerContext ctx) {
RpcAcceptedReply reply = RpcAcceptedReply.getInstance(call.getXid(),
- acceptState, Verifier.VERIFIER_NONE);
+ acceptState, VerifierNone.INSTANCE);
XDR out = new XDR();
reply.write(out);
diff --git
a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/Verifier.java
b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/Verifier.java
index 3c0e5fe..585e9fb 100644
---
a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/Verifier.java
+++
b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/Verifier.java
@@ -27,8 +27,6 @@ import org.apache.hadoop.oncrpc.XDR;
*/
public abstract class Verifier extends RpcAuthInfo {
- public static final Verifier VERIFIER_NONE = new VerifierNone();
-
protected Verifier(AuthFlavor flavor) {
super(flavor);
}
diff --git
a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/VerifierNone.java
b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/VerifierNone.java
index 8bccd1b..90d1fda 100644
---
a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/VerifierNone.java
+++
b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/VerifierNone.java
@@ -24,6 +24,8 @@ import com.google.common.base.Preconditions;
/** Verifier used by AUTH_NONE. */
public class VerifierNone extends Verifier {
+ public static final Verifier INSTANCE = new VerifierNone();
+
public VerifierNone() {
super(AuthFlavor.AUTH_NONE);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
