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 a8b0ec6 HDDS-4770. Upgrade Ratis Thirdparty to 0.6.0 (#1868)
a8b0ec6 is described below
commit a8b0ec6a0d20aa778aea3a98c51c7e0d15a0ad04
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Feb 1 13:21:21 2021 +0100
HDDS-4770. Upgrade Ratis Thirdparty to 0.6.0 (#1868)
---
.../container/common/transport/server/XceiverServerGrpc.java | 12 ++++--------
.../ozone/container/replication/ReplicationServer.java | 11 +++--------
pom.xml | 10 +++++-----
3 files changed, 12 insertions(+), 21 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/XceiverServerGrpc.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/XceiverServerGrpc.java
index 4bbde9d..d59efdc 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/XceiverServerGrpc.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/XceiverServerGrpc.java
@@ -46,7 +46,6 @@ import io.opentracing.Scope;
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;
@@ -90,13 +89,10 @@ public final class XceiverServerGrpc implements
XceiverServerSpi {
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()) {
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ReplicationServer.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ReplicationServer.java
index 1288b22..e8f831b 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ReplicationServer.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ReplicationServer.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.ozone.OzoneConsts;
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;
@@ -72,15 +71,11 @@ public class 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 {
diff --git a/pom.xml b/pom.xml
index 3d7a303..4035c85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
