(incubator-uniffle) branch master updated: [MINOR] improvement(client): Better explaination of partial reading failure when getting data from multiple replicas (#2143)

[zuston]

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

zuston 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 0c65a8bfe [MINOR] improvement(client): Better explaination of partial 
reading failure when getting data from multiple replicas (#2143)
0c65a8bfe is described below

commit 0c65a8bfec71f240c47addc24b668d57e2c42e62
Author: maobaolong <baoloong...@tencent.com>
AuthorDate: Thu Sep 26 14:17:34 2024 +0800

    [MINOR] improvement(client): Better explaination of partial reading failure 
when getting data from multiple replicas (#2143)
    
    ### What changes were proposed in this pull request?
    
    fix log content of MultiReplicaClientReadHandler#readShuffleData to 
different content for last server and others.
    
    ### Why are the changes needed?
    
    The existing log can make user stress, as we have multi replica or servers 
to handle shuffle data read, so we should warn to user until we cannot get all 
blocks from last server.
    
    ### Does this PR introduce _any_ user-facing change?
    
    Yes, the read task log will be more friendly.
    
    ### How was this patch tested?
    
    Test locally.
---
 .../handler/impl/MultiReplicaClientReadHandler.java | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git 
a/storage/src/main/java/org/apache/uniffle/storage/handler/impl/MultiReplicaClientReadHandler.java
 
b/storage/src/main/java/org/apache/uniffle/storage/handler/impl/MultiReplicaClientReadHandler.java
index c3e2200f9..262052927 100644
--- 
a/storage/src/main/java/org/apache/uniffle/storage/handler/impl/MultiReplicaClientReadHandler.java
+++ 
b/storage/src/main/java/org/apache/uniffle/storage/handler/impl/MultiReplicaClientReadHandler.java
@@ -76,10 +76,23 @@ public class MultiReplicaClientReadHandler extends 
AbstractClientReadHandler {
           RssUtils.checkProcessedBlockIds(blockIdBitmap, processedBlockIds);
           return result;
         } catch (RssException e) {
-          LOG.warn(
-              "Finished read from [{}], but haven't finished read all the 
blocks.",
-              shuffleServerInfos.get(readHandlerIndex).getId(),
-              e);
+          // If this is not the last server, then read next.
+          if (readHandlerIndex < handlers.size() - 1) {
+            LOG.info(
+                "Finished read from {}/{} [{}], haven't finished read all the 
blocks. Will read from next server {}",
+                readHandlerIndex + 1,
+                handlers.size(),
+                shuffleServerInfos.get(readHandlerIndex).getId(),
+                shuffleServerInfos.get(readHandlerIndex + 1).getId(),
+                e);
+          } else {
+            LOG.warn(
+                "Finished read from {}/{} [{}], but haven't finished read all 
the blocks.",
+                readHandlerIndex + 1,
+                handlers.size(),
+                shuffleServerInfos.get(readHandlerIndex).getId(),
+                e);
+          }
         }
         readHandlerIndex++;
       }