Skip to content
Open
Show file tree
Hide file tree
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
42 changes: 20 additions & 22 deletions pulsar/message_chunking_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"net/http"
"os"
"strings"
"sync"
"testing"
"time"

Expand Down Expand Up @@ -554,30 +553,29 @@ func sendSingleChunk(p Producer, uuid string, chunkID int, totalChunks int) {
mm.TotalChunkMsgSize = proto.Int32(int32(len(wholePayload)))
mm.ChunkId = proto.Int32(int32(chunkID))
producerImpl.updateMetadataSeqID(mm, msg)
sr := newSendRequest(
context.Background(),
producerImpl,
msg,
func(MessageID, *ProducerMessage, error) {},
true,
)
sr.totalChunks = totalChunks
sr.chunkID = chunkID
sr.uuid = uuid
sr.chunkRecorder = newChunkRecorder()
sr.uncompressedPayload = wholePayload
sr.uncompressedSize = int64(len(wholePayload))
sr.compressedPayload = wholePayload
sr.compressedSize = len(wholePayload)
sr.payloadChunkSize = internal.MaxMessageSize - proto.Size(mm)
sr.mm = mm
sr.deliverAt = time.Now()
sr.maxMessageSize = internal.MaxMessageSize
producerImpl.internalSingleSend(
mm,
msg.Payload,
&sendRequest{
callback: func(id MessageID, producerMessage *ProducerMessage, err error) {
},
callbackOnce: &sync.Once{},
ctx: context.Background(),
msg: msg,
producer: producerImpl,
flushImmediately: true,
totalChunks: totalChunks,
chunkID: chunkID,
uuid: uuid,
chunkRecorder: newChunkRecorder(),
uncompressedPayload: wholePayload,
uncompressedSize: int64(len(wholePayload)),
compressedPayload: wholePayload,
compressedSize: len(wholePayload),
payloadChunkSize: internal.MaxMessageSize - proto.Size(mm),
mm: mm,
deliverAt: time.Now(),
maxMessageSize: internal.MaxMessageSize,
},
sr,
uint32(internal.MaxMessageSize),
)
}
Expand Down
107 changes: 65 additions & 42 deletions pulsar/producer_partition.go
Original file line number Diff line number Diff line change
Expand Up @@ -660,36 +660,7 @@ func (p *partitionProducer) internalSend(sr *sendRequest) {
}
// update chunk id
sr.mm.ChunkId = proto.Int32(int32(chunkID))
nsr := sendRequestPool.Get().(*sendRequest)
*nsr = sendRequest{
pool: sendRequestPool,
ctx: sr.ctx,
msg: sr.msg,
producer: sr.producer,
callback: sr.callback,
callbackOnce: sr.callbackOnce,
publishTime: sr.publishTime,
flushImmediately: sr.flushImmediately,
totalChunks: sr.totalChunks,
chunkID: chunkID,
uuid: uuid,
chunkRecorder: cr,
transaction: sr.transaction,
memLimit: sr.memLimit,
semaphore: sr.semaphore,
reservedMem: int64(rhs - lhs),
sendAsBatch: sr.sendAsBatch,
schema: sr.schema,
schemaVersion: sr.schemaVersion,
uncompressedPayload: sr.uncompressedPayload,
uncompressedSize: sr.uncompressedSize,
compressedPayload: sr.compressedPayload,
compressedSize: sr.compressedSize,
payloadChunkSize: sr.payloadChunkSize,
mm: sr.mm,
deliverAt: sr.deliverAt,
maxMessageSize: sr.maxMessageSize,
}
nsr := newChunkSendRequest(sr, chunkID, uuid, cr, int64(rhs-lhs))

p.internalSingleSend(nsr.mm, nsr.compressedPayload[lhs:rhs], nsr, uint32(nsr.maxMessageSize))
}
Expand Down Expand Up @@ -1326,18 +1297,7 @@ func (p *partitionProducer) internalSendAsync(
return
}

sr := sendRequestPool.Get().(*sendRequest)
*sr = sendRequest{
pool: sendRequestPool,
ctx: ctx,
msg: msg,
producer: p,
callback: callback,
callbackOnce: &sync.Once{},
flushImmediately: flushImmediately,
publishTime: time.Now(),
chunkID: -1,
}
sr := newSendRequest(ctx, p, msg, callback, flushImmediately)

if err := p.prepareTransaction(sr); err != nil {
sr.done(nil, err)
Expand Down Expand Up @@ -1612,6 +1572,7 @@ func (p *partitionProducer) Close() {
}

type sendRequest struct {
doneFlag atomic.Bool
pool *sync.Pool
ctx context.Context
msg *ProducerMessage
Expand Down Expand Up @@ -1648,7 +1609,67 @@ type sendRequest struct {
maxMessageSize int32
}

func newSendRequest(
ctx context.Context,
p *partitionProducer,
msg *ProducerMessage,
callback func(MessageID, *ProducerMessage, error),
flushImmediately bool,
) *sendRequest {
sr := sendRequestPool.Get().(*sendRequest)
*sr = sendRequest{
pool: sendRequestPool,
ctx: ctx,
msg: msg,
producer: p,
callback: callback,
callbackOnce: &sync.Once{},
flushImmediately: flushImmediately,
publishTime: time.Now(),
chunkID: -1,
}
return sr
}

func newChunkSendRequest(p *sendRequest, chunkID int, uuid string, cr *chunkRecorder, reservedMem int64) *sendRequest {
sr := sendRequestPool.Get().(*sendRequest)
*sr = sendRequest{
pool: sendRequestPool,
ctx: p.ctx,
msg: p.msg,
producer: p.producer,
callback: p.callback,
callbackOnce: p.callbackOnce,
publishTime: p.publishTime,
flushImmediately: p.flushImmediately,
totalChunks: p.totalChunks,
chunkID: chunkID,
uuid: uuid,
chunkRecorder: cr,
transaction: p.transaction,
memLimit: p.memLimit,
semaphore: p.semaphore,
reservedMem: reservedMem,
sendAsBatch: p.sendAsBatch,
schema: p.schema,
schemaVersion: p.schemaVersion,
uncompressedPayload: p.uncompressedPayload,
uncompressedSize: p.uncompressedSize,
compressedPayload: p.compressedPayload,
compressedSize: p.compressedSize,
payloadChunkSize: p.payloadChunkSize,
mm: p.mm,
deliverAt: p.deliverAt,
maxMessageSize: p.maxMessageSize,
}
Comment on lines +1620 to +1664
Comment on lines +1620 to +1664
return sr
}

func (sr *sendRequest) done(msgID MessageID, err error) {
if !sr.doneFlag.CompareAndSwap(false, true) {
return
}

if err == nil {
sr.producer.metrics.PublishLatency.Observe(float64(time.Now().UnixNano()-sr.publishTime.UnixNano()) / 1.0e9)
sr.producer.metrics.MessagesPublished.Inc()
Expand Down Expand Up @@ -1700,6 +1721,8 @@ func (sr *sendRequest) done(msgID MessageID, err error) {
if pool != nil {
// reset all the fields
*sr = sendRequest{}
// Keep the guard raised until the object is reinitialized from the pool.
sr.doneFlag.Store(true)
Comment on lines 1722 to +1725
pool.Put(sr)
}
}
Expand Down
45 changes: 45 additions & 0 deletions pulsar/send_request_pool_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// 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 pulsar

import (
"context"
"errors"
"testing"

plog "github.com/apache/pulsar-client-go/pulsar/log"
"github.com/stretchr/testify/require"
)

func TestSendRequestDoneIsIdempotentAfterPutToPool(t *testing.T) {
sr := newSendRequest(
context.Background(),
&partitionProducer{log: plog.DefaultNopLogger()},
&ProducerMessage{Properties: map[string]string{"k": "v"}},
func(MessageID, *ProducerMessage, error) {},
false,
)

// First done() call returns sr to the pool and resets it.
sr.done(nil, errors.New("first error"))

// A second done() call on the same pointer should be ignored safely.
require.NotPanics(t, func() {
sr.done(nil, errors.New("second error"))
})
}
Loading