FMX commented on code in PR #3261:
URL: https://github.com/apache/celeborn/pull/3261#discussion_r2125715240
##########
client/src/main/java/org/apache/celeborn/client/read/CelebornInputStream.java:
##########
@@ -715,6 +734,41 @@ public synchronized void close() {
}
}
+ void validateIntegrity() throws IOException {
+ if (integrityChecked || !shuffleIntegrityCheckEnabled) {
+ return;
+ }
+
+ String key = Utils.makeReducerKey(shuffleId, partitionId);
+
+ if (readSkewPartitionWithoutMapRange) {
+ shuffleClient.reducerPartitionEnd(
+ shuffleId,
+ partitionId,
+ numberOfSubPartitions,
+ currentIndexOfSubPartition,
+ aggregatedActualCommitMetadata.getChecksum(),
+ aggregatedActualCommitMetadata.getBytes());
+ logger.info(
+ "reducerPartitionEnd successful for {}. actual CommitMetadata: {}",
+ key,
+ aggregatedActualCommitMetadata);
+ } else {
+ shuffleClient.reducerPartitionEnd(
Review Comment:
It means that the celeborn input stream has finished reading the reduce
partitions. We could have a more meaningful function name here.
##########
common/src/main/java/org/apache/celeborn/common/CommitMetadata.java:
##########
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.celeborn.common;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicLong;
+
+import io.netty.buffer.ByteBuf;
+
+public class CommitMetadata {
+
+ private AtomicLong bytes = new AtomicLong();
+ private CelebornCRC32 crc = new CelebornCRC32();
+
+ public CommitMetadata() {}
+
+ public CommitMetadata(long checksum, long numBytes) {
+ this.bytes = new AtomicLong(numBytes);
+ this.crc = new CelebornCRC32((int) checksum);
+ }
+
+ void addBytes(long bytes) {
+ while (true) {
Review Comment:
It looks like you have re-implemented the `addAndGet` method. Is there a
particular reason for this?
##########
client/src/main/scala/org/apache/celeborn/client/commit/SkewHandlingWithoutMapRangeValidator.scala:
##########
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.celeborn.client.commit
+
+import org.roaringbitmap.RoaringBitmap
+
+import org.apache.celeborn.common.CommitMetadata
+import org.apache.celeborn.common.util.JavaUtils
+
+class SkewHandlingWithoutMapRangeValidator extends
AbstractPartitionCompletenessValidator {
+
+ private val totalSubPartitionsProcessed =
JavaUtils.newConcurrentHashMap[Int, RoaringBitmap]()
+ private val partitionToSubPartitionCount =
JavaUtils.newConcurrentHashMap[Int, Int]()
+ private val subPartitionToCommiMetadata =
JavaUtils.newConcurrentHashMap[Int, CommitMetadata]()
Review Comment:
```suggestion
private val subPartitionToCommitMetadata =
JavaUtils.newConcurrentHashMap[Int, CommitMetadata]()
```
##########
client/src/main/scala/org/apache/celeborn/client/LifecycleManager.scala:
##########
@@ -438,6 +456,22 @@ class LifecycleManager(val appUniqueId: String, val conf:
CelebornConf) extends
throw new UnsupportedOperationException(s"Not support $partitionType
yet")
}
+ case pb: ReducerPartitionEnd =>
Review Comment:
Renaming it to ReadReducerPartitionEnd will be semantically clear.
##########
client/src/main/scala/org/apache/celeborn/client/commit/LegacySkewHandlingPartitionValidator.scala:
##########
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.celeborn.client.commit
+
+import java.util
+import java.util.Comparator
+import java.util.function.BiFunction
+
+import com.google.common.base.Preconditions.{checkArgument, checkState}
+
+import org.apache.celeborn.common.CommitMetadata
+import org.apache.celeborn.common.internal.Logging
+import org.apache.celeborn.common.util.JavaUtils
+
+class LegacySkewHandlingPartitionValidator extends
AbstractPartitionCompletenessValidator
+ with Logging {
+ private val subRangeToCommitMetadataPerReducer = {
+ JavaUtils.newConcurrentHashMap[Int, java.util.TreeMap[(Int, Int),
CommitMetadata]]()
+ }
+ private val partitionToSubPartitionCount =
JavaUtils.newConcurrentHashMap[Int, Int]()
+ private val currentCommitMetadataForReducer =
+ JavaUtils.newConcurrentHashMap[Int, CommitMetadata]()
+ private val currentTotalMapRangeSumForReducer =
JavaUtils.newConcurrentHashMap[Int, Int]()
Review Comment:
It is the count of map IDs.
##########
client/src/main/java/org/apache/celeborn/client/read/CelebornInputStream.java:
##########
@@ -715,6 +734,41 @@ public synchronized void close() {
}
}
+ void validateIntegrity() throws IOException {
+ if (integrityChecked || !shuffleIntegrityCheckEnabled) {
+ return;
+ }
+
+ String key = Utils.makeReducerKey(shuffleId, partitionId);
+
+ if (readSkewPartitionWithoutMapRange) {
+ shuffleClient.reducerPartitionEnd(
+ shuffleId,
+ partitionId,
+ numberOfSubPartitions,
+ currentIndexOfSubPartition,
+ aggregatedActualCommitMetadata.getChecksum(),
+ aggregatedActualCommitMetadata.getBytes());
+ logger.info(
+ "reducerPartitionEnd successful for {}. actual CommitMetadata: {}",
+ key,
+ aggregatedActualCommitMetadata);
+ } else {
+ shuffleClient.reducerPartitionEnd(
+ shuffleId,
+ partitionId,
+ startMapIndex,
+ endMapIndex,
+ aggregatedActualCommitMetadata.getChecksum(),
+ aggregatedActualCommitMetadata.getBytes());
+ logger.info(
+ "reducerPartitionEnd successful for {}. actual CommitMetadata: {}",
+ key,
+ aggregatedActualCommitMetadata);
+ }
+ integrityChecked = true;
Review Comment:
https://github.com/apache/celeborn/blob/f3e8644588e5773ae8159fbc8770f87eed32ebff/client/src/main/java/org/apache/celeborn/client/read/CelebornInputStream.java#L764-L767
https://github.com/apache/celeborn/blob/f3e8644588e5773ae8159fbc8770f87eed32ebff/client/src/main/java/org/apache/celeborn/client/read/CelebornInputStream.java#L752-L755
These two code blocks are identical, they can be merged and moved here.
##########
client/src/main/scala/org/apache/celeborn/client/commit/LegacySkewHandlingPartitionValidator.scala:
##########
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.celeborn.client.commit
+
+import java.util
+import java.util.Comparator
+import java.util.function.BiFunction
+
+import com.google.common.base.Preconditions.{checkArgument, checkState}
+
+import org.apache.celeborn.common.CommitMetadata
+import org.apache.celeborn.common.internal.Logging
+import org.apache.celeborn.common.util.JavaUtils
+
+class LegacySkewHandlingPartitionValidator extends
AbstractPartitionCompletenessValidator
+ with Logging {
+ private val subRangeToCommitMetadataPerReducer = {
+ JavaUtils.newConcurrentHashMap[Int, java.util.TreeMap[(Int, Int),
CommitMetadata]]()
+ }
+ private val partitionToSubPartitionCount =
JavaUtils.newConcurrentHashMap[Int, Int]()
+ private val currentCommitMetadataForReducer =
+ JavaUtils.newConcurrentHashMap[Int, CommitMetadata]()
+ private val currentTotalMapRangeSumForReducer =
JavaUtils.newConcurrentHashMap[Int, Int]()
+ private val comparator: java.util.Comparator[(Int, Int)] = new
Comparator[(Int, Int)] {
+ override def compare(o1: (Int, Int), o2: (Int, Int)): Int = {
+ val comparator = Integer.compare(o1._1, o2._1)
+ if (comparator != 0)
+ comparator
+ else
+ Integer.compare(o1._2, o2._2)
+ }
+ }
+
+ private def checkOverlappingRange(
+ treeMap: java.util.TreeMap[(Int, Int), CommitMetadata],
+ startMapIndex: Int,
+ endMapIndex: Int): (Boolean, ((Int, Int), CommitMetadata)) = {
+ val floorEntry: util.Map.Entry[(Int, Int), CommitMetadata] =
+ treeMap.floorEntry((startMapIndex, endMapIndex))
+ val ceilingEntry: util.Map.Entry[(Int, Int), CommitMetadata] =
+ treeMap.ceilingEntry((startMapIndex, endMapIndex))
+
+ if (floorEntry != null) {
+ if (startMapIndex < floorEntry.getKey._2) {
+ return (true, ((floorEntry.getKey._1, floorEntry.getKey._2),
floorEntry.getValue))
+ }
+ }
+ if (ceilingEntry != null) {
+ if (endMapIndex > ceilingEntry.getKey._1) {
+ return (true, ((ceilingEntry.getKey._1, ceilingEntry.getKey._2),
ceilingEntry.getValue))
+ }
+ }
+ (false, ((0, 0), new CommitMetadata()))
+ }
+
+ override def processSubPartition(
+ partitionId: Int,
+ startMapIndex: Int,
+ endMapIndex: Int,
+ actualCommitMetadata: CommitMetadata,
+ expectedTotalMapperCount: Int): (Boolean, String) = {
+ checkArgument(
+ startMapIndex < endMapIndex,
+ "startMapIndex %s must be less than endMapIndex %s",
+ startMapIndex,
+ endMapIndex)
+ logDebug(
+ s"Validate partition invoked for partitionId $partitionId startMapIndex
$startMapIndex endMapIndex $endMapIndex")
+ partitionToSubPartitionCount.put(partitionId, expectedTotalMapperCount)
+ val subRangeToCommitMetadataMap =
subRangeToCommitMetadataPerReducer.computeIfAbsent(
+ partitionId,
+ new java.util.function.Function[Int, util.TreeMap[(Int, Int),
CommitMetadata]] {
+ override def apply(key: Int): util.TreeMap[(Int, Int), CommitMetadata]
=
+ new util.TreeMap[(Int, Int), CommitMetadata](comparator)
+ })
+ subRangeToCommitMetadataMap.synchronized {
+ val existingMetadata = subRangeToCommitMetadataMap.get((startMapIndex,
endMapIndex))
+ if (existingMetadata == null) {
+ val (isOverlapping, overlappingEntry) =
+ checkOverlappingRange(subRangeToCommitMetadataMap, startMapIndex,
endMapIndex)
+ if (isOverlapping) {
+ val errorMessage = s"Encountered overlapping map range for
partitionId: $partitionId " +
+ s" while processing range with startMapIndex: $startMapIndex and
endMapIndex: $endMapIndex " +
+ s"existing range map: $subRangeToCommitMetadataMap " +
+ s"overlapped with Entry((startMapIndex, endMapIndex), count):
$overlappingEntry"
+ logError(errorMessage)
+ return (false, errorMessage)
+ } else {
+ subRangeToCommitMetadataMap.put((startMapIndex, endMapIndex),
actualCommitMetadata)
+ currentCommitMetadataForReducer.merge(
+ partitionId,
+ actualCommitMetadata,
+ new java.util.function.BiFunction[CommitMetadata, CommitMetadata,
CommitMetadata] {
+ override def apply(t: CommitMetadata, u: CommitMetadata):
CommitMetadata = {
+ if (t == null) {
+ return u
+ }
+ if (u == null) {
+ return t
+ }
+ CommitMetadata.combineMetadata(t, u)
+ }
+ })
+ currentTotalMapRangeSumForReducer.merge(
+ partitionId,
+ endMapIndex - startMapIndex,
+ new BiFunction[Int, Int, Int] {
+ override def apply(t: Int, u: Int): Int =
+ Integer.sum(t, u)
+ })
+ }
+ } else if (existingMetadata != actualCommitMetadata) {
+ val errorMessage = s"Commit Metadata for partition: $partitionId " +
+ s"not matching for sub-partition with startMapIndex: $startMapIndex
endMapIndex: $endMapIndex " +
+ s"previous count: $existingMetadata new count: $actualCommitMetadata"
+ logError(errorMessage)
+ return (false, errorMessage)
+ }
+ if (!currentTotalMapRangeSumForReducer.containsKey(partitionId)) {
+ checkState(!currentCommitMetadataForReducer.containsKey(
+ partitionId,
+ "mapper total count missing while processing partitionId %s
startMapIndex %s endMapIndex %s",
+ partitionId,
+ startMapIndex,
+ endMapIndex))
+ currentTotalMapRangeSumForReducer.put(partitionId, 0)
+ currentCommitMetadataForReducer.put(partitionId, new CommitMetadata())
+ }
+ checkState(
+ currentCommitMetadataForReducer.containsKey(partitionId),
+ "mapper written count missing while processing partitionId %s
startMapIndex %s endMapIndex %s",
+ partitionId,
+ startMapIndex,
+ endMapIndex)
+ val sumOfMapRanges: Int =
currentTotalMapRangeSumForReducer.get(partitionId)
+ val currentCommitMetadata: CommitMetadata =
+ currentCommitMetadataForReducer.get(partitionId)
+
+ if (sumOfMapRanges > expectedTotalMapperCount) {
+ val errorMsg = s"AQE Partition $partitionId failed validation check " +
+ s"while processing startMapIndex: $startMapIndex endMapIndex:
$endMapIndex " +
+ s"ActualCommitMatadata $currentCommitMetadata >
ExpectedTotalMapperCount $expectedTotalMapperCount"
Review Comment:
Here is a typo. `ActualCommitMatadata` --> `ActualCommitMetadata`
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
