Skip to content

[CELEBORN-2277] Replace synchronized in Flusher.getWorkerIndex with AtomicInteger #3621

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.

Sign up for GitHub

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

Open
cxzl25 wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −5
Open

[CELEBORN-2277] Replace synchronized in Flusher.getWorkerIndex with AtomicInteger #3621

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfd16b3
fix
cxzl25 Mar 9, 2026
a51a4af
Potential fix for pull request finding
cxzl25 Mar 19, 2026
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
13 changes: 8 additions & 5 deletions worker/src/main/scala/org/apache/celeborn/service/deploy/worker/storage/Flusher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ package org.apache.celeborn.service.deploy.worker.storage

import java.io.IOException
import java.util.concurrent.{ExecutorService, LinkedBlockingQueue, TimeUnit}
import java.util.concurrent.atomic.{AtomicBoolean, AtomicLongArray}
import java.util.concurrent.atomic.{AtomicBoolean, AtomicInteger, AtomicLongArray}
import java.util.function.IntUnaryOperator

import scala.util.Random

Expand Down Expand Up @@ -48,7 +49,10 @@ abstract private[worker] class Flusher(
protected val workingQueues = new Array[LinkedBlockingQueue[FlushTask]](threadCount)
protected val bufferQueue = new LinkedBlockingQueue[CompositeByteBuf]()
protected val workers = new Array[ExecutorService](threadCount)
protected var nextWorkerIndex: Int = 0
protected val nextWorkerIndex: AtomicInteger = new AtomicInteger(0)
private val workerIndexUpdater: IntUnaryOperator = new IntUnaryOperator {
override def applyAsInt(i: Int): Int = (i + 1) % threadCount
}

val lastBeginFlushTime: AtomicLongArray = new AtomicLongArray(threadCount)
val stopFlag = new AtomicBoolean(false)
Expand Down Expand Up @@ -104,9 +108,8 @@ abstract private[worker] class Flusher(
ThreadPoolSource.registerSource(s"$this", workers)
}

def getWorkerIndex: Int = synchronized {
nextWorkerIndex = (nextWorkerIndex + 1) % threadCount
nextWorkerIndex
def getWorkerIndex: Int = {
nextWorkerIndex.updateAndGet(workerIndexUpdater)
}

def takeBuffer(): CompositeByteBuf = {
Expand Down
Loading