You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@uniffle.apache.org by GitBox <gi...@apache.org> on 2022/10/26 02:44:26 UTC

[GitHub] [incubator-uniffle] frankliee commented on a diff in pull request #276: [ISSUE-124] Add fallback mechanism for blocks read inconsistent

frankliee commented on code in PR #276:
URL: https://github.com/apache/incubator-uniffle/pull/276#discussion_r1005152296


##########
storage/src/main/java/org/apache/uniffle/storage/handler/impl/HdfsClientReadHandler.java:
##########
@@ -127,21 +127,32 @@ public ShuffleDataResult readShuffleData() {
       init(fullShufflePath);
     }
 
-    if (readHandlerIndex >= readHandlers.size()) {
+    if (finished()) {
       return new ShuffleDataResult();
     }
 
-    HdfsShuffleReadHandler hdfsShuffleFileReader = readHandlers.get(readHandlerIndex);
-    ShuffleDataResult shuffleDataResult = hdfsShuffleFileReader.readShuffleData();
-
-    while (shuffleDataResult == null) {
-      ++readHandlerIndex;
+    HdfsShuffleReadHandler hdfsShuffleFileReader;

Review Comment:
   HdfsShuffleReadHandler hdfsShuffleFileReader = null; ?
    



##########
storage/src/main/java/org/apache/uniffle/storage/handler/impl/HdfsClientReadHandler.java:
##########
@@ -127,21 +127,32 @@ public ShuffleDataResult readShuffleData() {
       init(fullShufflePath);
     }
 
-    if (readHandlerIndex >= readHandlers.size()) {
+    if (finished()) {
       return new ShuffleDataResult();
     }
 
-    HdfsShuffleReadHandler hdfsShuffleFileReader = readHandlers.get(readHandlerIndex);
-    ShuffleDataResult shuffleDataResult = hdfsShuffleFileReader.readShuffleData();
-
-    while (shuffleDataResult == null) {
-      ++readHandlerIndex;
+    HdfsShuffleReadHandler hdfsShuffleFileReader;
+    ShuffleDataResult shuffleDataResult = null;
+    do {
       if (readHandlerIndex >= readHandlers.size()) {
         return new ShuffleDataResult();
       }
       hdfsShuffleFileReader = readHandlers.get(readHandlerIndex);
-      shuffleDataResult = hdfsShuffleFileReader.readShuffleData();
-    }
+      if (hdfsShuffleFileReader.finished()) {
+        ++readHandlerIndex;
+        continue;
+      }
+      try {
+        shuffleDataResult = hdfsShuffleFileReader.readShuffleData();
+      } catch (Exception e) {
+        ++readHandlerIndex;
+        continue;
+      }
+
+      if (shuffleDataResult == null || shuffleDataResult.isEmpty()) {

Review Comment:
   It looks strange to use the same condition `(shuffleDataResult == null || shuffleDataResult.isEmpty())` twice.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@uniffle.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@uniffle.apache.org
For additional commands, e-mail: issues-help@uniffle.apache.org