Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CH][CELEBORN] CHCelebornColumnarBatchSerializer uses AtomicBoolean to identify whether to call close() to avoid calling close() twice situation #6455

Merged
merged 1 commit into from
Jul 15, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import org.apache.celeborn.client.read.CelebornInputStream
import java.io._
import java.nio.ByteBuffer
import java.util.Locale
import java.util.concurrent.atomic.AtomicBoolean

import scala.reflect.ClassTag

Expand Down Expand Up @@ -74,7 +75,8 @@ private class CHCelebornColumnarBatchSerializerInstance(
private var numBatchesTotal: Long = _
private var numRowsTotal: Long = _

private var isClosed: Boolean = false
// Otherwise calling close() twice would cause replication of metrics.
private val closeCalled: AtomicBoolean = new AtomicBoolean(false)

override def asIterator: Iterator[Any] = {
// This method is never called by shuffle code.
Expand Down Expand Up @@ -153,18 +155,18 @@ private class CHCelebornColumnarBatchSerializerInstance(
}

override def close(): Unit = {
if (!isClosed) {
if (numBatchesTotal > 0) {
readBatchNumRows.set(numRowsTotal.toDouble / numBatchesTotal)
}
numOutputRows += numRowsTotal
if (cb != null) {
cb.close()
cb = null
}
closeReader()
isClosed = true
if (!closeCalled.compareAndSet(false, true)) {
return
}
if (numBatchesTotal > 0) {
readBatchNumRows.set(numRowsTotal.toDouble / numBatchesTotal)
}
numOutputRows += numRowsTotal
if (cb != null) {
cb.close()
cb = null
}
closeReader()
}

def getReader: CHStreamReader = {
Expand Down
Loading