HDDS-11257. Ozone write does not work when http proxy is set for the …

…JVM. (#7036)
apache · Aug 7, 2024 · 6569278 · 6569278
1 parent e091e47
commit 6569278
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
@@ -191,6 +191,7 @@ protected NettyChannelBuilder createChannel(DatanodeDetails dn, int port)
     NettyChannelBuilder channelBuilder =
         NettyChannelBuilder.forAddress(dn.getIpAddress(), port).usePlaintext()
             .maxInboundMessageSize(OzoneConsts.OZONE_SCM_CHUNK_MAX_SIZE)
+            .proxyDetector(uri -> null)
             .intercept(new GrpcClientInterceptor());
     if (secConfig.isSecurityEnabled() && secConfig.isGrpcTlsEnabled()) {
       SslContextBuilder sslContextBuilder = GrpcSslContexts.forClient();

diff --git a/...ce/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java b/...ce/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java
@@ -74,7 +74,8 @@ public GrpcReplicationClient(
     NettyChannelBuilder channelBuilder =
         NettyChannelBuilder.forAddress(host, port)
             .usePlaintext()
-            .maxInboundMessageSize(OzoneConsts.OZONE_SCM_CHUNK_MAX_SIZE);
+            .maxInboundMessageSize(OzoneConsts.OZONE_SCM_CHUNK_MAX_SIZE)
+            .proxyDetector(uri -> null);
 
     if (secConfig.isSecurityEnabled() && secConfig.isGrpcTlsEnabled()) {
       channelBuilder.useTransportSecurity();

diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/InterSCMGrpcClient.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/InterSCMGrpcClient.java
@@ -67,7 +67,8 @@ public InterSCMGrpcClient(final String host,
             TimeUnit.MILLISECONDS);
     NettyChannelBuilder channelBuilder =
         NettyChannelBuilder.forAddress(host, port).usePlaintext()
-            .maxInboundMessageSize(OzoneConsts.OZONE_SCM_CHUNK_MAX_SIZE);
+            .maxInboundMessageSize(OzoneConsts.OZONE_SCM_CHUNK_MAX_SIZE)
+            .proxyDetector(uri -> null);
     SecurityConfig securityConfig = new SecurityConfig(conf);
     if (securityConfig.isSecurityEnabled()
         && securityConfig.isGrpcTlsEnabled()) {

diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/GrpcOmTransport.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/GrpcOmTransport.java
@@ -145,6 +145,7 @@ public void start() throws IOException {
       NettyChannelBuilder channelBuilder =
           NettyChannelBuilder.forAddress(hp.getHost(), hp.getPort())
               .usePlaintext()
+              .proxyDetector(uri -> null)
               .maxInboundMessageSize(maxSize);
 
       if (secConfig.isSecurityEnabled() && secConfig.isGrpcTlsEnabled()) {

diff --git a/...ne/tools/src/main/java/org/apache/hadoop/ozone/freon/FollowerAppendLogEntryGenerator.java b/...ne/tools/src/main/java/org/apache/hadoop/ozone/freon/FollowerAppendLogEntryGenerator.java
@@ -168,7 +168,8 @@ public Void call() throws Exception {
         .build();
 
     NettyChannelBuilder channelBuilder =
-        NettyChannelBuilder.forTarget(serverAddress);
+        NettyChannelBuilder.forTarget(serverAddress)
+            .proxyDetector(uri -> null);
     channelBuilder.negotiationType(NegotiationType.PLAINTEXT);
     ManagedChannel build = channelBuilder.build();
     stub = RaftServerProtocolServiceGrpc.newStub(build);

diff --git a/...zone/tools/src/main/java/org/apache/hadoop/ozone/freon/LeaderAppendLogEntryGenerator.java b/...zone/tools/src/main/java/org/apache/hadoop/ozone/freon/LeaderAppendLogEntryGenerator.java
@@ -144,7 +144,7 @@ public Void call() throws Exception {
         .build();
 
     NettyChannelBuilder channelBuilder =
-        NettyChannelBuilder.forTarget(serverAddress);
+        NettyChannelBuilder.forTarget(serverAddress).proxyDetector(uri -> null);
     channelBuilder.negotiationType(NegotiationType.PLAINTEXT);
     ManagedChannel build = channelBuilder.build();
     stub = RaftServerProtocolServiceGrpc.newStub(build);