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

[FLINK-36979][rpc] Reverting pekko version bump in Flink 1.20 #25866

Open
wants to merge 1 commit into
base: release-1.20
Choose a base branch
from
+16 −25
Open

[FLINK-36979][rpc] Reverting pekko version bump in Flink 1.20 #25866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 4 additions & 10 deletions flink-rpc/flink-rpc-akka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ under the License.
</description>

<properties>
<pekko.version>1.1.2</pekko.version>
<pekko.version>1.0.1</pekko.version>
<scala.binary.version>2.12</scala.binary.version>
<scala.version>2.12.16</scala.version>
</properties>
Expand Down Expand Up @@ -94,8 +94,8 @@ under the License.
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<scope>test</scope>
<artifactId>netty</artifactId>
<version>3.10.6.Final</version>
<optional>${flink.markBundledAsOptional}</optional>
</dependency>

Expand Down Expand Up @@ -172,15 +172,9 @@ under the License.
<include>*</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>io.netty</pattern>
<shadedPattern>org.apache.flink.shaded.netty4.io.netty</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>io.netty:*</artifact>
<artifact>io.netty:netty</artifact>
<excludes>
<!-- Only some of these licenses actually apply to the JAR and have been manually
placed in this module's resources directory. -->
Expand Down
4 changes: 1 addition & 3 deletions ...-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/ActorSystemBootstrapTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,7 @@ public static ActorSystem startRemoteActorSystem(
} catch (Exception e) {
// we can continue to try if this contains a netty channel exception
Throwable cause = e.getCause();
if (!(cause
instanceof
org.apache.flink.shaded.netty4.io.netty.channel.ChannelException
if (!(cause instanceof org.jboss.netty.channel.ChannelException
|| cause instanceof java.net.BindException)) {
throw e;
} // else fall through the loop and try the next port
Expand Down
5 changes: 2 additions & 3 deletions flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/PekkoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@
import org.apache.flink.util.TimeUtils;
import org.apache.flink.util.function.FunctionUtils;

import org.apache.flink.shaded.netty4.io.netty.util.internal.logging.InternalLoggerFactory;
import org.apache.flink.shaded.netty4.io.netty.util.internal.logging.Slf4JLoggerFactory;

import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import org.apache.pekko.actor.ActorRef;
import org.apache.pekko.actor.ActorSystem;
import org.apache.pekko.actor.Address;
import org.apache.pekko.actor.AddressFromURIString;
import org.jboss.netty.logging.InternalLoggerFactory;
import org.jboss.netty.logging.Slf4JLoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
18 changes: 9 additions & 9 deletions flink-rpc/flink-rpc-akka/src/main/resources/META-INF/NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ The Apache Software Foundation (http://www.apache.org/).

This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)

- com.hierynomus:asn-one:0.6.0
- com.hierynomus:asn-one:0.5.0
- com.typesafe:config:1.4.2
- com.typesafe:ssl-config-core_2.12:0.6.1
- io.netty:netty-all:4.1.91.Final
- org.agrona:agrona:1.22.0
- org.apache.pekko:pekko-actor_2.12:1.1.2
- org.apache.pekko:pekko-remote_2.12:1.1.2
- org.apache.pekko:pekko-pki_2.12:1.1.2
- org.apache.pekko:pekko-protobuf-v3_2.12:1.1.2
- org.apache.pekko:pekko-slf4j_2.12:1.1.2
- org.apache.pekko:pekko-stream_2.12:1.1.2
- io.netty:netty:3.10.6.Final
- org.agrona:agrona:1.15.1
- org.apache.pekko:pekko-actor_2.12:1.0.1
- org.apache.pekko:pekko-remote_2.12:1.0.1
- org.apache.pekko:pekko-pki_2.12:1.0.1
- org.apache.pekko:pekko-protobuf-v3_2.12:1.0.1
- org.apache.pekko:pekko-slf4j_2.12:1.0.1
- org.apache.pekko:pekko-stream_2.12:1.0.1
- org.scala-lang:scala-library:2.12.16

The following dependencies all share the same BSD license which you find under licenses/LICENSE.scala.
Expand Down