You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uniffle.apache.org by xi...@apache.org on 2023/11/17 03:35:44 UTC

(incubator-uniffle) 03/03: [#1309] fix(spark): WriteBufferManager in Spark2 does not use a reassigned shuffle server. (#1310)

This is an automated email from the ASF dual-hosted git repository.

xianjingfeng pushed a commit to branch branch-0.8
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git

commit 0da1dd1164437a4cde40722d268014459bb58f6c
Author: yl09099 <33...@users.noreply.github.com>
AuthorDate: Sat Nov 11 22:46:41 2023 +0800

    [#1309] fix(spark): WriteBufferManager in Spark2 does not use a reassigned shuffle server. (#1310)
    
    ### What changes were proposed in this pull request?
    
    In Spark2, after a write failure, ShuffleBlockInfo is not built using the new shuffle server after the shuffle server is reassigned.
    
    ### Why are the changes needed?
    
    Fix: #1309
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Existing UT.
    
    (cherry picked from commit d5de2993f58060b7f2d719509eaed967ff137ad7)
---
 .../src/main/java/org/apache/spark/shuffle/writer/RssShuffleWriter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client-spark/spark2/src/main/java/org/apache/spark/shuffle/writer/RssShuffleWriter.java b/client-spark/spark2/src/main/java/org/apache/spark/shuffle/writer/RssShuffleWriter.java
index 11f2dd3ba..77d1a85d2 100644
--- a/client-spark/spark2/src/main/java/org/apache/spark/shuffle/writer/RssShuffleWriter.java
+++ b/client-spark/spark2/src/main/java/org/apache/spark/shuffle/writer/RssShuffleWriter.java
@@ -179,7 +179,7 @@ public class RssShuffleWriter<K, V, C> extends ShuffleWriter<K, V> {
             taskAttemptId,
             bufferOptions,
             rssHandle.getDependency().serializer(),
-            rssHandle.getPartitionToServers(),
+            shuffleHandleInfo.getPartitionToServers(),
             context.taskMemoryManager(),
             shuffleWriteMetrics,
             RssSparkConfig.toRssConf(sparkConf),