Skip to content

HDDS-4770. Upgrade Ratis Thirdparty to 0.6.0 #1868

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

Merged
adoroszlai merged 2 commits into from
Feb 1, 2021
Merged

HDDS-4770. Upgrade Ratis Thirdparty to 0.6.0 #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80c60d8
HDDS-4770. Upgrade Ratis Thirdparty to 0.6.0
adoroszlai Jan 31, 2021
81391ac
Fix findbugs
adoroszlai Feb 1, 2021
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
12 changes: 4 additions & 8 deletions ...ain/java/org/apache/hadoop/ozone/container/common/transport/server/XceiverServerGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import io.opentracing.Span;
import io.opentracing.util.GlobalTracer;
import org.apache.ratis.thirdparty.io.grpc.Server;
import org.apache.ratis.thirdparty.io.grpc.ServerBuilder;
import org.apache.ratis.thirdparty.io.grpc.ServerInterceptors;
import org.apache.ratis.thirdparty.io.grpc.netty.GrpcSslContexts;
import org.apache.ratis.thirdparty.io.grpc.netty.NettyServerBuilder;
Expand Down Expand Up @@ -90,13 +89,10 @@ public XceiverServerGrpc(DatanodeDetails datanodeDetails,
this.port = 0;
}

NettyServerBuilder nettyServerBuilder =
((NettyServerBuilder) ServerBuilder.forPort(port))
.maxInboundMessageSize(OzoneConsts.OZONE_SCM_CHUNK_MAX_SIZE);

GrpcServerInterceptor tracingInterceptor = new GrpcServerInterceptor();
nettyServerBuilder.addService(ServerInterceptors.intercept(
new GrpcXceiverService(dispatcher), tracingInterceptor));
NettyServerBuilder nettyServerBuilder = NettyServerBuilder.forPort(port)
.maxInboundMessageSize(OzoneConsts.OZONE_SCM_CHUNK_MAX_SIZE)
.addService(ServerInterceptors.intercept(
new GrpcXceiverService(dispatcher), new GrpcServerInterceptor()));

SecurityConfig secConf = new SecurityConfig(conf);
if (secConf.isGrpcTlsEnabled()) {
Expand Down
11 changes: 3 additions & 8 deletions ...ervice/src/main/java/org/apache/hadoop/ozone/container/replication/ReplicationServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController;

import org.apache.ratis.thirdparty.io.grpc.Server;
import org.apache.ratis.thirdparty.io.grpc.ServerBuilder;
import org.apache.ratis.thirdparty.io.grpc.ServerInterceptors;
import org.apache.ratis.thirdparty.io.grpc.netty.GrpcSslContexts;
import org.apache.ratis.thirdparty.io.grpc.netty.NettyServerBuilder;
Expand Down Expand Up @@ -72,15 +71,11 @@ public ReplicationServer(
}

public void init() {
NettyServerBuilder nettyServerBuilder =
((NettyServerBuilder) ServerBuilder.forPort(port))
.maxInboundMessageSize(OzoneConsts.OZONE_SCM_CHUNK_MAX_SIZE);

GrpcServerInterceptor tracingInterceptor = new GrpcServerInterceptor();
nettyServerBuilder
NettyServerBuilder nettyServerBuilder = NettyServerBuilder.forPort(port)
.maxInboundMessageSize(OzoneConsts.OZONE_SCM_CHUNK_MAX_SIZE)
.addService(ServerInterceptors.intercept(new GrpcReplicationService(
new OnDemandContainerReplicationSource(controller)
), tracingInterceptor));
), new GrpcServerInterceptor()));

if (secConf.isSecurityEnabled()) {
try {
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<declared.ozone.version>${ozone.version}</declared.ozone.version>

<!-- Apache Ratis version -->
<ratis.version>1.1.0-eb66796d-SNAPSHOT</ratis.version>
<ratis.version>1.1.0-0bdf24f-SNAPSHOT</ratis.version>

<!-- Apache Ratis thirdparty version -->
<ratis.thirdparty.version>0.6.0-SNAPSHOT</ratis.thirdparty.version>
<ratis.thirdparty.version>0.6.0</ratis.thirdparty.version>

<distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>
<distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
Expand Down Expand Up @@ -178,11 +178,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs

<!-- Maven protoc compiler -->
<protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version>
<protobuf-compile.version>3.11.0</protobuf-compile.version>
<grpc-compile.version>1.29.0</grpc-compile.version>
<protobuf-compile.version>3.12.0</protobuf-compile.version>
<grpc-compile.version>1.33.0</grpc-compile.version>
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>

<netty.version>4.1.48.Final</netty.version>
<netty.version>4.1.51.Final</netty.version>

<!-- define the Java language version used by the compiler -->
<javac.version>1.8</javac.version>
Expand Down