Skip to content

Fix invalid capacity when getByteBufferView of 2G block #32

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
jeynmann wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix invalid capacity when getByteBufferView of 2G block #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c78480b
fix invalid size for getByteBufferView of 2G block
JeynmannZ Jan 4, 2024
4154cd2
Merge branch 'master' into pr_support_2g_block
JeynmannZ Jan 16, 2024
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: 7 additions & 6 deletions src/main/scala/org/apache/spark/shuffle/ucx/UcxWorkerWrapper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ case class UcxWorkerWrapper(worker: UcpWorker, transport: UcxShuffleTransport, i
override def onSuccess(r: UcpRequest): Unit = {
request.completed = true
stats.endTime = System.nanoTime()
logDebug(s"Received rndv data of size: ${mem.size} for tag $i in " +
s"${stats.getElapsedTimeNs} ns " +
logDebug(s"Received rndv data of size: ${ucpAmData.getLength}" +
s" for tag $i in ${stats.getElapsedTimeNs} ns " +
s"time from amHandle: ${System.nanoTime() - stats.amHandleTime} ns")
for (b <- 0 until numBlocks) {
val blockSize = headerBuffer.getInt
Expand Down Expand Up @@ -280,10 +280,11 @@ case class UcxWorkerWrapper(worker: UcpWorker, transport: UcxShuffleTransport, i

def handleFetchBlockRequest(blocks: Seq[Block], replyTag: Int, replyExecutor: Long): Unit = try {
val tagAndSizes = UnsafeUtils.INT_SIZE + UnsafeUtils.INT_SIZE * blocks.length
val resultMemory = transport.hostBounceBufferMemoryPool.get(tagAndSizes + blocks.map(_.getSize).sum)
val msgSize = tagAndSizes + blocks.map(_.getSize).sum
val resultMemory = transport.hostBounceBufferMemoryPool.get(msgSize)
.asInstanceOf[UcxBounceBufferMemoryBlock]
val resultBuffer = UcxUtils.getByteBufferView(resultMemory.address,
resultMemory.size)
msgSize)
resultBuffer.putInt(replyTag)

var offset = 0
Expand Down Expand Up @@ -311,9 +312,9 @@ case class UcxWorkerWrapper(worker: UcpWorker, transport: UcxShuffleTransport, i

val startTime = System.nanoTime()
val req = connections(replyExecutor).sendAmNonBlocking(1, resultMemory.address, tagAndSizes,
resultMemory.address + tagAndSizes, resultMemory.size - tagAndSizes, 0, new UcxCallback {
resultMemory.address + tagAndSizes, msgSize - tagAndSizes, 0, new UcxCallback {
override def onSuccess(request: UcpRequest): Unit = {
logTrace(s"Sent ${blocks.length} blocks of size: ${resultMemory.size} " +
logTrace(s"Sent ${blocks.length} blocks of size: ${msgSize} " +
s"to tag $replyTag in ${System.nanoTime() - startTime} ns.")
transport.hostBounceBufferMemoryPool.put(resultMemory)
}
Expand Down