Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Aug 7, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
822879e
HDDS-11257. Ozone write does not work when http proxy is set for the …
Aug 6, 2024
cbee623
remove config for tests
Aug 6, 2024
ffa687b
fix checkstyl
Aug 6, 2024
ad8df33
address comment
Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion ...ce/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,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();
Expand Down
3 changes: 2 additions & 1 deletion hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/InterSCMGrpcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,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()) {
Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/GrpcOmTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
3 changes: 2 additions & 1 deletion ...ne/tools/src/main/java/org/apache/hadoop/ozone/freon/FollowerAppendLogEntryGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...zone/tools/src/main/java/org/apache/hadoop/ozone/freon/LeaderAppendLogEntryGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down