Skip to content

unlock unused queue when orderly consumer rebalance #1220

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

unlock unused queue when orderly consumer rebalance #1220

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c64ae4
mq unlock when delete from process queue
wgffgw Aug 11, 2025
c38b9f2
unlock unused queue when orderly consumer rebalance
wgffgw Sep 5, 2025
7851664
Merge pull request #1 from wgffgw/orderly_consume_unlock
wgffgw Sep 5, 2025
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
21 changes: 20 additions & 1 deletion consumer/consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ func (dc *defaultConsumer) doBalance() {
"rebalanceResultSize": len(allocateResult),
"rebalanceResultSet": allocateResult,
})
}
}
}
return true
})
Expand Down Expand Up @@ -709,10 +709,12 @@ func (dc *defaultConsumer) updateProcessQueueTable(topic string, mqs []*primitiv
mq := key.(primitive.MessageQueue)
pq := value.(*processQueue)
if mq.Topic == topic {
unlockMqs := make([]*primitive.MessageQueue, 0, 1)
if !mqSet[mq] {
pq.WithDropped(true)
if dc.removeUnnecessaryMessageQueue(&mq, pq) {
dc.processQueueTable.Delete(key)
unlockMqs = append(unlockMqs, &mq)
changed = true
rlog.Info("remove unnecessary mq when updateProcessQueueTable", map[string]interface{}{
rlog.LogKeyConsumerGroup: dc.consumerGroup,
Expand All @@ -723,13 +725,30 @@ func (dc *defaultConsumer) updateProcessQueueTable(topic string, mqs []*primitiv
pq.WithDropped(true)
if dc.removeUnnecessaryMessageQueue(&mq, pq) {
dc.processQueueTable.Delete(key)
unlockMqs = append(unlockMqs, &mq)
changed = true
rlog.Warning("remove unnecessary mq because pull was expired, prepare to fix it", map[string]interface{}{
rlog.LogKeyConsumerGroup: dc.consumerGroup,
rlog.LogKeyMessageQueue: mq.String(),
})
}
}

if dc.consumeOrderly && len(unlockMqs) > 0 {
// 释放掉不再订阅的mq的锁，不再订阅的mq已经在上面被删除了
go func() {
brokerResult := dc.client.GetNameSrv().FindBrokerAddressInSubscribe(mq.BrokerName, internal.MasterId, true)

if brokerResult != nil {
body := &lockBatchRequestBody{
ConsumerGroup: dc.consumerGroup,
ClientId: dc.client.ClientID(),
MQs: unlockMqs,
}
dc.doUnlock(brokerResult.BrokerAddr, body, false)
}
}()
}
}
return true
})
Expand Down