RexXiong commented on code in PR #3261: URL: https://github.com/apache/celeborn/pull/3261#discussion_r2125898152
########## 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) Review Comment: `CommitMetadata.combineMetadata` always return new combinedMetadata, seems not so efficient ########## common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala: ########## @@ -5473,6 +5474,14 @@ object CelebornConf extends Logging { .booleanConf .createWithDefault(false) + val CLIENT_SHUFFLE_INTEGRITY_CHECK_ENABLED: ConfigEntry[Boolean] = Review Comment: E2E shuffle integrity check only support `spark` currently. So IMO better use `celeborn.client.spark.shuffle.integrityCheck.enabled` -- 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]
