(incubator-uniffle) branch master updated: [#1269] fix(tez): uniqueMapId may be not unique when more than one fetcher are working. (#1270)

[roryqi]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d992c3857 [#1269] fix(tez): uniqueMapId may be not unique when more 
than one fetcher are working. (#1270)
d992c3857 is described below

commit d992c385794a441659acb6cf466a97481bb968cc
Author: zhengchenyu <zhengcheny...@163.com>
AuthorDate: Tue Oct 31 17:40:05 2023 +0800

    [#1269] fix(tez): uniqueMapId may be not unique when more than one fetcher 
are working. (#1270)
    
    ### What changes were proposed in this pull request?
    
    make uniqueMapId static.
    
    ### Why are the changes needed?
    
    Fix: #1269
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    When flush to disk, may produce this bug. Test and verify on cluster.
---
 .../main/java/org/apache/hadoop/mapreduce/task/reduce/RssFetcher.java   | 2 +-
 .../apache/tez/runtime/library/common/shuffle/impl/RssTezFetcher.java   | 2 +-
 .../library/common/shuffle/orderedgrouped/RssTezShuffleDataFetcher.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/client-mr/core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/RssFetcher.java
 
b/client-mr/core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/RssFetcher.java
index d6ccba2f4..27d382cce 100644
--- 
a/client-mr/core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/RssFetcher.java
+++ 
b/client-mr/core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/RssFetcher.java
@@ -83,7 +83,7 @@ public class RssFetcher<K, V> {
   private long copyTime = 0; // the sum of readTime + decompressTime + 
serializeTime + waitTime
   private long unCompressionLength = 0;
   private final TaskAttemptID reduceId;
-  private int uniqueMapId = 0;
+  private static int uniqueMapId = 0;
 
   private boolean hasPendingData = false;
   private long startWait;
diff --git 
a/client-tez/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/RssTezFetcher.java
 
b/client-tez/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/RssTezFetcher.java
index 071d5314f..5ff38333c 100644
--- 
a/client-tez/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/RssTezFetcher.java
+++ 
b/client-tez/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/RssTezFetcher.java
@@ -56,7 +56,7 @@ public class RssTezFetcher {
   private long waitTime = 0;
   private long copyTime = 0; // the sum of readTime + decompressTime + 
serializeTime + waitTime
   private long unCompressionLength = 0;
-  private int uniqueMapId = 0;
+  private static int uniqueMapId = 0;
 
   private boolean hasPendingData = false;
   private long startWait;
diff --git 
a/client-tez/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/RssTezShuffleDataFetcher.java
 
b/client-tez/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/RssTezShuffleDataFetcher.java
index 86c4be648..66859c28c 100644
--- 
a/client-tez/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/RssTezShuffleDataFetcher.java
+++ 
b/client-tez/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/RssTezShuffleDataFetcher.java
@@ -64,7 +64,7 @@ public class RssTezShuffleDataFetcher extends 
CallableWithNdc<Void> {
   private long copyTime = 0; // the sum of readTime + decompressTime + 
serializeTime + waitTime
   private long unCompressionLength = 0;
   private final InputAttemptIdentifier inputAttemptIdentifier;
-  private int uniqueMapId = 0;
+  private static int uniqueMapId = 0;
 
   private boolean hasPendingData = false;
   private long startWait;