Skip to content

Commit f34935f

Browse files
committed
Minor style corrections
1 parent 48e4c89 commit f34935f

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RemoteBlockPushResolver.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ public StreamCallbackWithID receiveBlockDataAsStream(PushBlockStream msg) {
358358
private int length = 0;
359359
// This indicates that this stream got the opportunity to write the blocks to the merged file.
360360
// Once this is set to true and the stream encounters a failure then it will take necessary
361-
// action to overwrite the partial written data. This is reset to false when the stream
361+
// action to overwrite any partial written data. This is reset to false when the stream
362362
// completes without any failures.
363363
private boolean startBlockWrite = false;
364364
// Use on-heap instead of direct ByteBuffer since these buffers will be GC'ed very quickly
@@ -592,10 +592,10 @@ public void onComplete(String streamId) throws IOException {
592592

593593
@Override
594594
public void onFailure(String streamId, Throwable throwable) throws IOException {
595-
if (!errorHandler.shouldLogError(throwable)) {
596-
logger.debug("Encountered issue when merging shuffle partition block {}", msg, throwable);
597-
} else {
595+
if (errorHandler.shouldLogError(throwable)) {
598596
logger.error("Encountered issue when merging shuffle partition block {}", msg, throwable);
597+
} else {
598+
logger.debug("Encountered issue when merging shuffle partition block {}", msg, throwable);
599599
}
600600
// Only update partitionInfo if the failure corresponds to a valid request. If the
601601
// request is too late, i.e. received after shuffle merge finalize, #onFailure will
@@ -758,10 +758,8 @@ public static class AppShufflePartitionInfo {
758758
private RoaringBitmap mapTracker;
759759
// The index file for a particular merged shuffle contains the chunk offsets.
760760
private final FileChannel indexChannel;
761-
/**
762-
* The meta file for a particular merged shuffle contains all the map ids that belong to every
763-
* chunk. The entry per chunk is a serialized bitmap.
764-
*/
761+
// The meta file for a particular merged shuffle contains all the map ids that belong to every
762+
// chunk. The entry per chunk is a serialized bitmap.
765763
private final FileChannel metaChannel;
766764
private final DataOutputStream indexWriteStream;
767765
// The offset for the last chunk tracked in the index file for this shuffle partition
@@ -772,7 +770,8 @@ public static class AppShufflePartitionInfo {
772770
private RoaringBitmap chunkTracker;
773771
ByteBuf trackerBuf = null;
774772

775-
AppShufflePartitionInfo(AppShufflePartitionId partitionId,
773+
AppShufflePartitionInfo(
774+
AppShufflePartitionId partitionId,
776775
File targetFile,
777776
File indexFile,
778777
File metaFile) throws IOException {

0 commit comments

Comments
 (0)