This is an automated email from the ASF dual-hosted git repository.
ethanfeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new 927d62425 [CELEBORN-1125][FOLLOWUP] Add failureaccess shade
927d62425 is described below
commit 927d62425bfae99e62278371f526cad07f153d47
Author: onebox-li <[email protected]>
AuthorDate: Mon Nov 27 18:01:38 2023 +0800
[CELEBORN-1125][FOLLOWUP] Add failureaccess shade
### What changes were proposed in this pull request?
Add failureaccess shade.
### Why are the changes needed?
When test main branch, client got error like below:
```
Caused by: java.lang.NoClassDefFoundError:
org/apache/celeborn/shaded/com/google/common/util/concurrent/internal/InternalFutureFailureAccess
at
org.apache.celeborn.shaded.com.google.common.cache.LocalCache$LoadingValueReference.<init>(LocalCache.java:3517)
at
org.apache.celeborn.shaded.com.google.common.cache.LocalCache$LoadingValueReference.<init>(LocalCache.java:3521)
at
org.apache.celeborn.shaded.com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2170)
at
org.apache.celeborn.shaded.com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2081)
at
org.apache.celeborn.shaded.com.google.common.cache.LocalCache.get(LocalCache.java:4019)
at
org.apache.celeborn.shaded.com.google.common.cache.LocalCache$LocalManualCache.get(LocalCache.java:4933)
at
org.apache.celeborn.client.commit.ReducePartitionCommitHandler.replyGetReducerFileGroup(ReducePartitionCommitHandler.scala:283)
at
org.apache.celeborn.client.commit.ReducePartitionCommitHandler.handleGetReducerFileGroup(ReducePartitionCommitHandler.scala:300)
at
org.apache.celeborn.client.CommitManager.handleGetReducerFileGroup(CommitManager.scala:266)
at
org.apache.celeborn.client.LifecycleManager.org$apache$celeborn$client$LifecycleManager$$handleGetReducerFileGroup(LifecycleManager.scala:628)
at
org.apache.celeborn.client.LifecycleManager$$anonfun$receiveAndReply$1.applyOrElse(LifecycleManager.scala:314)
at
org.apache.celeborn.common.rpc.netty.Inbox.$anonfun$process$1(Inbox.scala:115)
at
org.apache.celeborn.common.rpc.netty.Inbox.safelyCall(Inbox.scala:222)
at
org.apache.celeborn.common.rpc.netty.Inbox.process(Inbox.scala:110)
at
org.apache.celeborn.common.rpc.netty.Dispatcher$MessageLoop.run(Dispatcher.scala:227)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
at java.lang.Thread.run(Thread.java:748)
```
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Manual test.
Closes #2116 from onebox-li/shade-add-failureaccess.
Authored-by: onebox-li <[email protected]>
Signed-off-by: mingji <[email protected]>
---
client-flink/flink-1.14-shaded/pom.xml | 1 +
client-flink/flink-1.15-shaded/pom.xml | 1 +
client-flink/flink-1.17-shaded/pom.xml | 1 +
client-flink/flink-1.18-shaded/pom.xml | 1 +
client-mr/mr-shaded/pom.xml | 1 +
client-spark/spark-2-shaded/pom.xml | 1 +
client-spark/spark-3-shaded/pom.xml | 1 +
project/CelebornBuild.scala | 3 +++
8 files changed, 10 insertions(+)
diff --git a/client-flink/flink-1.14-shaded/pom.xml
b/client-flink/flink-1.14-shaded/pom.xml
index 9f3b52308..8f1d08928 100644
--- a/client-flink/flink-1.14-shaded/pom.xml
+++ b/client-flink/flink-1.14-shaded/pom.xml
@@ -69,6 +69,7 @@
<include>org.apache.celeborn:*</include>
<include>com.google.protobuf:protobuf-java</include>
<include>com.google.guava:guava</include>
+ <include>com.google.guava:failureaccess</include>
<include>io.netty:*</include>
<include>org.apache.commons:commons-lang3</include>
<include>org.roaringbitmap:RoaringBitmap</include>
diff --git a/client-flink/flink-1.15-shaded/pom.xml
b/client-flink/flink-1.15-shaded/pom.xml
index a4597d64b..84bc2959a 100644
--- a/client-flink/flink-1.15-shaded/pom.xml
+++ b/client-flink/flink-1.15-shaded/pom.xml
@@ -69,6 +69,7 @@
<include>org.apache.celeborn:*</include>
<include>com.google.protobuf:protobuf-java</include>
<include>com.google.guava:guava</include>
+ <include>com.google.guava:failureaccess</include>
<include>io.netty:*</include>
<include>org.apache.commons:commons-lang3</include>
<include>org.roaringbitmap:RoaringBitmap</include>
diff --git a/client-flink/flink-1.17-shaded/pom.xml
b/client-flink/flink-1.17-shaded/pom.xml
index 32754de00..7ee254646 100644
--- a/client-flink/flink-1.17-shaded/pom.xml
+++ b/client-flink/flink-1.17-shaded/pom.xml
@@ -69,6 +69,7 @@
<include>org.apache.celeborn:*</include>
<include>com.google.protobuf:protobuf-java</include>
<include>com.google.guava:guava</include>
+ <include>com.google.guava:failureaccess</include>
<include>io.netty:*</include>
<include>org.apache.commons:commons-lang3</include>
<include>org.roaringbitmap:RoaringBitmap</include>
diff --git a/client-flink/flink-1.18-shaded/pom.xml
b/client-flink/flink-1.18-shaded/pom.xml
index b03e83029..acd17f04d 100644
--- a/client-flink/flink-1.18-shaded/pom.xml
+++ b/client-flink/flink-1.18-shaded/pom.xml
@@ -69,6 +69,7 @@
<include>org.apache.celeborn:*</include>
<include>com.google.protobuf:protobuf-java</include>
<include>com.google.guava:guava</include>
+ <include>com.google.guava:failureaccess</include>
<include>io.netty:*</include>
<include>org.apache.commons:commons-lang3</include>
<include>org.roaringbitmap:RoaringBitmap</include>
diff --git a/client-mr/mr-shaded/pom.xml b/client-mr/mr-shaded/pom.xml
index 9ecb39b9f..795e28d01 100644
--- a/client-mr/mr-shaded/pom.xml
+++ b/client-mr/mr-shaded/pom.xml
@@ -77,6 +77,7 @@
<include>org.apache.celeborn:*</include>
<include>com.google.protobuf:protobuf-java</include>
<include>com.google.guava:guava</include>
+ <include>com.google.guava:failureaccess</include>
<include>io.netty:*</include>
<include>org.apache.commons:commons-lang3</include>
<include>org.scala-lang:scala-library</include>
diff --git a/client-spark/spark-2-shaded/pom.xml
b/client-spark/spark-2-shaded/pom.xml
index 962a4871e..655e4b433 100644
--- a/client-spark/spark-2-shaded/pom.xml
+++ b/client-spark/spark-2-shaded/pom.xml
@@ -69,6 +69,7 @@
<include>org.apache.celeborn:*</include>
<include>com.google.protobuf:protobuf-java</include>
<include>com.google.guava:guava</include>
+ <include>com.google.guava:failureaccess</include>
<include>io.netty:*</include>
<include>org.apache.commons:commons-lang3</include>
<include>org.roaringbitmap:RoaringBitmap</include>
diff --git a/client-spark/spark-3-shaded/pom.xml
b/client-spark/spark-3-shaded/pom.xml
index 2b55c8fee..c8701776d 100644
--- a/client-spark/spark-3-shaded/pom.xml
+++ b/client-spark/spark-3-shaded/pom.xml
@@ -69,6 +69,7 @@
<include>org.apache.celeborn:*</include>
<include>com.google.protobuf:protobuf-java</include>
<include>com.google.guava:guava</include>
+ <include>com.google.guava:failureaccess</include>
<include>io.netty:*</include>
<include>org.apache.commons:commons-lang3</include>
<include>org.roaringbitmap:RoaringBitmap</include>
diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala
index cf6b43e19..e940702cd 100644
--- a/project/CelebornBuild.scala
+++ b/project/CelebornBuild.scala
@@ -680,6 +680,7 @@ trait SparkClientProjects {
!(name.startsWith("celeborn-") ||
name.startsWith("protobuf-java-") ||
name.startsWith("guava-") ||
+ name.startsWith("failureaccess-") ||
name.startsWith("netty-") ||
name.startsWith("commons-lang3-") ||
name.startsWith("RoaringBitmap-"))
@@ -883,6 +884,7 @@ trait FlinkClientProjects {
!(name.startsWith("celeborn-") ||
name.startsWith("protobuf-java-") ||
name.startsWith("guava-") ||
+ name.startsWith("failureaccess-") ||
name.startsWith("netty-") ||
name.startsWith("commons-lang3-") ||
name.startsWith("RoaringBitmap-"))
@@ -977,6 +979,7 @@ object MRClientProjects {
!(name.startsWith("celeborn-") ||
name.startsWith("protobuf-java-") ||
name.startsWith("guava-") ||
+ name.startsWith("failureaccess-") ||
name.startsWith("netty-") ||
name.startsWith("commons-lang3-") ||
name.startsWith("RoaringBitmap-") ||
