You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celeborn.apache.org by re...@apache.org on 2023/03/21 08:49:55 UTC
[incubator-celeborn] branch main updated: [CELEBORN-453] In the removeExpiredShuffle method, the taskShuffleId should be removed instead of the shuffleId (#1368)
This is an automated email from the ASF dual-hosted git repository.
rexxiong 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 ba89ee98c [CELEBORN-453] In the removeExpiredShuffle method, the taskShuffleId should be removed instead of the shuffleId (#1368)
ba89ee98c is described below
commit ba89ee98cea294bddd2f22c5f991df3bb37ee02a
Author: jiaoqingbo <11...@qq.com>
AuthorDate: Tue Mar 21 16:49:50 2023 +0800
[CELEBORN-453] In the removeExpiredShuffle method, the taskShuffleId should be removed instead of the shuffleId (#1368)
---
.../main/java/org/apache/celeborn/plugin/flink/ShuffleTaskInfo.java | 2 +-
.../java/org/apache/celeborn/plugin/flink/ShuffleTaskInfoSuitJ.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/client-flink/flink-1.14/src/main/java/org/apache/celeborn/plugin/flink/ShuffleTaskInfo.java b/client-flink/flink-1.14/src/main/java/org/apache/celeborn/plugin/flink/ShuffleTaskInfo.java
index 6593f4a1d..4c4c2a9d1 100644
--- a/client-flink/flink-1.14/src/main/java/org/apache/celeborn/plugin/flink/ShuffleTaskInfo.java
+++ b/client-flink/flink-1.14/src/main/java/org/apache/celeborn/plugin/flink/ShuffleTaskInfo.java
@@ -73,7 +73,7 @@ public class ShuffleTaskInfo {
if (shuffleIdToTaskShuffleId.containsKey(shuffleId)) {
String taskShuffleId = shuffleIdToTaskShuffleId.remove(shuffleId);
taskShuffleIdToShuffleId.remove(taskShuffleId);
- taskShuffleAttemptIdIndex.remove(shuffleId);
+ taskShuffleAttemptIdIndex.remove(taskShuffleId);
taskShuffleAttemptIdToAttemptId.remove(taskShuffleId);
}
}
diff --git a/client-flink/flink-1.14/src/test/java/org/apache/celeborn/plugin/flink/ShuffleTaskInfoSuitJ.java b/client-flink/flink-1.14/src/test/java/org/apache/celeborn/plugin/flink/ShuffleTaskInfoSuitJ.java
index fd6325cf5..7acaa6405 100644
--- a/client-flink/flink-1.14/src/test/java/org/apache/celeborn/plugin/flink/ShuffleTaskInfoSuitJ.java
+++ b/client-flink/flink-1.14/src/test/java/org/apache/celeborn/plugin/flink/ShuffleTaskInfoSuitJ.java
@@ -47,10 +47,13 @@ public class ShuffleTaskInfoSuitJ {
shuffleTaskInfo.removeExpiredShuffle(encodeShuffleId);
int encodeShuffleIdNew = shuffleTaskInfo.getShuffleId("shuffleId");
Assert.assertEquals(encodeShuffleIdNew, 2);
+
+ int encodeAttemptId211 = shuffleTaskInfo.getAttemptId("shuffleId", 1, "attempt1");
+ Assert.assertEquals(encodeAttemptId211, 0);
}
@Test
- public void testRemoveNonExistShuffl() {
+ public void testRemoveNonExistShuffle() {
ShuffleTaskInfo shuffleTaskInfo = new ShuffleTaskInfo();
// remove none exist shuffle
shuffleTaskInfo.removeExpiredShuffle(0);