Skip to content

Commit

Permalink
Pin the netty-transport-native-epoll to avoid conflicts (apache#6194)
Browse files Browse the repository at this point in the history
### Motivation

Currently the version pinning for `netty-transport-native-epoll` is not including the native library artifact. 

That results, depending on the Maven version, to be picking up an earlier version of `transport-native-epoll-4.1.33.Final-linux-x86_64.jar`, where the version is 4.1.33 as opposed to 4.1.43 which is the correct expected version. 

This results in using Java NIO based transport instead of the more effiecient/performant epoll based one.

This affects 2.5.0 as well.
  • Loading branch information
merlimat authored Feb 8, 2020
1 parent 43d89f2 commit 857d63b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 2 deletions.
3 changes: 2 additions & 1 deletion distribution/server/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,10 @@ The Apache Software License, Version 2.0
- io.netty-netty-resolver-4.1.43.Final.jar
- io.netty-netty-resolver-dns-4.1.43.Final.jar
- io.netty-netty-transport-4.1.43.Final.jar
- io.netty-netty-transport-native-epoll-4.1.33.Final-linux-x86_64.jar
- io.netty-netty-transport-native-epoll-4.1.43.Final-linux-x86_64.jar
- io.netty-netty-transport-native-epoll-4.1.43.Final.jar
- io.netty-netty-transport-native-unix-common-4.1.43.Final.jar
- io.netty-netty-transport-native-unix-common-4.1.43.Final-linux-x86_64.jar
- io.netty-netty-tcnative-boringssl-static-2.0.26.Final.jar
* Prometheus client
- io.prometheus-simpleclient-0.5.0.jar
Expand Down
14 changes: 14 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -473,12 +473,26 @@ flexible messaging model and an intuitive client API.</description>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
<classifier>linux-x86_64</classifier>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${netty.version}</version>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${netty.version}</version>
<classifier>linux-x86_64</classifier>
</dependency>

<!-- `netty-codec-http2` is a dependency of grpc, set the version to
Expand Down
2 changes: 2 additions & 0 deletions pulsar-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,13 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<classifier>linux-x86_64</classifier>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<classifier>linux-x86_64</classifier>
</dependency>

<dependency>
Expand Down
3 changes: 2 additions & 1 deletion pulsar-sql/presto-distribution/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,9 @@ The Apache Software License, Version 2.0
- netty-tcnative-boringssl-static-2.0.26.Final.jar
- netty-transport-4.1.43.Final.jar
- netty-transport-native-epoll-4.1.43.Final.jar
- netty-transport-native-epoll-4.1.33.Final-linux-x86_64.jar
- netty-transport-native-epoll-4.1.43.Final-linux-x86_64.jar
- netty-transport-native-unix-common-4.1.43.Final.jar
- netty-transport-native-unix-common-4.1.43.Final-linux-x86_64.jar
* Joda Time
- joda-time-2.9.9.jar
- joda-time-2.10.1.jar
Expand Down

0 comments on commit 857d63b

Please sign in to comment.