This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 6569278b93 HDDS-11257. Ozone write does not work when http proxy is
set for the JVM. (#7036)
6569278b93 is described below
commit 6569278b936058cbae7533b06a0415e51741c74d
Author: Sadanand Shenoy <[email protected]>
AuthorDate: Wed Aug 7 14:19:24 2024 +0530
HDDS-11257. Ozone write does not work when http proxy is set for the JVM.
(#7036)
---
.../src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java | 1 +
.../hadoop/ozone/container/replication/GrpcReplicationClient.java | 3 ++-
.../main/java/org/apache/hadoop/hdds/scm/ha/InterSCMGrpcClient.java | 3 ++-
.../java/org/apache/hadoop/ozone/om/protocolPB/GrpcOmTransport.java | 1 +
.../org/apache/hadoop/ozone/freon/FollowerAppendLogEntryGenerator.java | 3 ++-
.../org/apache/hadoop/ozone/freon/LeaderAppendLogEntryGenerator.java | 2 +-
6 files changed, 9 insertions(+), 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
index c468056547..048eab95fa 100644
---
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 @@ public class XceiverClientGrpc extends XceiverClientSpi {
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/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java
index ad4f4293b9..dd741ec25d 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java
@@ -74,7 +74,8 @@ public class GrpcReplicationClient implements AutoCloseable {
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
index eebcfac03c..484e18902c 100644
---
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 class InterSCMGrpcClient implements
SCMSnapshotDownloader {
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
index 96f7b48665..ac2e85da84 100644
---
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 class GrpcOmTransport implements OmTransport {
NettyChannelBuilder channelBuilder =
NettyChannelBuilder.forAddress(hp.getHost(), hp.getPort())
.usePlaintext()
+ .proxyDetector(uri -> null)
.maxInboundMessageSize(maxSize);
if (secConfig.isSecurityEnabled() && secConfig.isGrpcTlsEnabled()) {
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/FollowerAppendLogEntryGenerator.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/FollowerAppendLogEntryGenerator.java
index d76081fd29..76ef7888d0 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/FollowerAppendLogEntryGenerator.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/FollowerAppendLogEntryGenerator.java
@@ -168,7 +168,8 @@ public class FollowerAppendLogEntryGenerator extends
BaseAppendLogGenerator
.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/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/LeaderAppendLogEntryGenerator.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/LeaderAppendLogEntryGenerator.java
index 40f6702603..9038f37918 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/LeaderAppendLogEntryGenerator.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/LeaderAppendLogEntryGenerator.java
@@ -144,7 +144,7 @@ public class LeaderAppendLogEntryGenerator extends
BaseAppendLogGenerator
.build();
NettyChannelBuilder channelBuilder =
- NettyChannelBuilder.forTarget(serverAddress);
+ NettyChannelBuilder.forTarget(serverAddress).proxyDetector(uri ->
null);
channelBuilder.negotiationType(NegotiationType.PLAINTEXT);
ManagedChannel build = channelBuilder.build();
stub = RaftServerProtocolServiceGrpc.newStub(build);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
