This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch HDDS-4440-s3-performance
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-4440-s3-performance by
this push:
new cf8eb33 HDDS-5210. Create GRPC service definition for existing OM
protocol (#2375)
cf8eb33 is described below
commit cf8eb336ec919e0ea5ec86254ca5d8292794b4fa
Author: Neil Joshi <[email protected]>
AuthorDate: Thu Jul 29 07:22:00 2021 -0600
HDDS-5210. Create GRPC service definition for existing OM protocol (#2375)
---
hadoop-hdds/interface-client/pom.xml | 2 +-
hadoop-hdds/interface-server/pom.xml | 2 +-
hadoop-ozone/common/pom.xml | 13 +++++++++++++
hadoop-ozone/csi/pom.xml | 16 ++++++++++++----
hadoop-ozone/interface-client/pom.xml | 34 ++++++++++++++++++++++++++++++++--
hadoop-ozone/s3gateway/pom.xml | 24 +++++++++++++++++++++++-
pom.xml | 2 +-
7 files changed, 83 insertions(+), 10 deletions(-)
diff --git a/hadoop-hdds/interface-client/pom.xml
b/hadoop-hdds/interface-client/pom.xml
index 1f950c3..3606eec 100644
--- a/hadoop-hdds/interface-client/pom.xml
+++ b/hadoop-hdds/interface-client/pom.xml
@@ -77,7 +77,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<clearOutputDirectory>false</clearOutputDirectory>
<pluginId>grpc-java</pluginId>
<pluginArtifact>
-
io.grpc:protoc-gen-grpc-java:${grpc-compile.version}:exe:${os.detected.classifier}
+
io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}
</pluginArtifact>
</configuration>
</execution>
diff --git a/hadoop-hdds/interface-server/pom.xml
b/hadoop-hdds/interface-server/pom.xml
index 7dfeca8..b4b7e10 100644
--- a/hadoop-hdds/interface-server/pom.xml
+++ b/hadoop-hdds/interface-server/pom.xml
@@ -74,7 +74,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<clearOutputDirectory>false</clearOutputDirectory>
<pluginId>grpc-java</pluginId>
<pluginArtifact>
-
io.grpc:protoc-gen-grpc-java:${grpc-compile.version}:exe:${os.detected.classifier}
+
io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}
</pluginArtifact>
</configuration>
</execution>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index 7f7576f..fa54932 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -31,6 +31,19 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependencies>
<dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
+ <version>${io.grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler-proxy</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index fa8cb07..65e8495 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -67,7 +67,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
- <version>${grpc-compile.version}</version>
+ <version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -75,6 +75,14 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>io.netty</groupId>
+ <artifactId>netty-handler-proxy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
</dependency>
<dependency>
@@ -88,7 +96,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
- <version>${grpc-compile.version}</version>
+ <version>${io.grpc.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
@@ -99,7 +107,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
- <version>${grpc-compile.version}</version>
+ <version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -167,7 +175,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<configuration>
<pluginId>grpc-java</pluginId>
<pluginArtifact>
-
io.grpc:protoc-gen-grpc-java:${grpc-compile.version}:exe:${os.detected.classifier}
+
io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}
</pluginArtifact>
</configuration>
</execution>
diff --git a/hadoop-ozone/interface-client/pom.xml
b/hadoop-ozone/interface-client/pom.xml
index 08b3575..1695e4e 100644
--- a/hadoop-ozone/interface-client/pom.xml
+++ b/hadoop-ozone/interface-client/pom.xml
@@ -37,6 +37,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ <version>${io.grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ <version>${io.grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler-proxy</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -51,16 +69,28 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<extensions>true</extensions>
<executions>
<execution>
- <id>compile-protoc</id>
+ <id>compile-protoc-OmGrpc</id>
<goals>
<goal>compile</goal>
<goal>test-compile</goal>
+ <goal>compile-custom</goal>
+ <goal>test-compile-custom</goal>
</goals>
<configuration>
- <protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<protocArtifact>
com.google.protobuf:protoc:${hadooprpc.protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
+ <protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
+ <includes>
+ <include>OmClientProtocol.proto</include>
+ <include>Security.proto</include>
+ </includes>
+
<outputDirectory>target/generated-sources/protobuf/java</outputDirectory>
+ <clearOutputDirectory>false</clearOutputDirectory>
+ <pluginId>grpc-java</pluginId>
+ <pluginArtifact>
+
io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}
+ </pluginArtifact>
</configuration>
</execution>
</executions>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index f6b63da..696a61d 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -94,7 +94,29 @@
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
+ <version>${io.grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ <version>${io.grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ <version>${io.grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-server</artifactId>
diff --git a/pom.xml b/pom.xml
index 0097604..ccf2bf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,10 +172,10 @@ 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>
<grpc.protobuf-compile.version>3.12.0</grpc.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.63.Final</netty.version>
+ <io.grpc.version>1.38.0</io.grpc.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]
