Skip to content

[ISSUE #10898] Wake NettyEventExecutor immediately on shutdown #10915

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
123123213weqw wants to merge 2 commits into
base: develop
Choose a base branch
from
+14 −4
Open

[ISSUE #10898] Wake NettyEventExecutor immediately on shutdown #10915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
134efd2
[ISSUE
123123213weqw Aug 12, 2026
3da362b
[ISSUE #10898] Wake NettyEventExecutor immediately on shutdown
123123213weqw Aug 12, 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
8 changes: 5 additions & 3 deletions broker/src/main/java/org/apache/rocketmq/broker/pop/PopConsumerRocksdbStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,11 @@ public List<PopConsumerRecord> scanExpiredRecords(long lower, long upper, int ma
// configure prefix indexing to improve the performance of scans.
// However, in the current implementation, this is not the bottleneck.
List<PopConsumerRecord> consumerRecordList = new ArrayList<>();
try (ReadOptions scanOptions = new ReadOptions()
.setIterateLowerBound(new Slice(ByteBuffer.allocate(Long.BYTES).putLong(lower).array()))
.setIterateUpperBound(new Slice(ByteBuffer.allocate(Long.BYTES).putLong(upper).array()));
try (Slice lowerBound = new Slice(ByteBuffer.allocate(Long.BYTES).putLong(lower).array());
Slice upperBound = new Slice(ByteBuffer.allocate(Long.BYTES).putLong(upper).array());
ReadOptions scanOptions = new ReadOptions()
.setIterateLowerBound(lowerBound)
.setIterateUpperBound(upperBound);
RocksIterator iterator = db.newIterator(this.columnFamilyHandle, scanOptions)) {
iterator.seek(ByteBuffer.allocate(Long.BYTES).putLong(lower).array());
while (iterator.isValid() && consumerRecordList.size() < maxCount) {
Expand Down
10 changes: 9 additions & 1 deletion remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ public void run() {
while (!this.isStopped()) {
try {
NettyEvent event = this.eventQueue.poll(3000, TimeUnit.MILLISECONDS);
if (event != null && listener != null) {
if (event != null && event.getType() != null && listener != null) {
switch (event.getType()) {
case IDLE:
listener.onChannelIdle(event.getRemoteAddr(), event.getChannel());
Expand Down Expand Up @@ -814,6 +814,14 @@ public void run() {
log.info(this.getServiceName() + " service end");
}

@Override
public void shutdown(final boolean interrupt) {
// wake up the thread blocked on eventQueue.poll() so it observes the stopped flag
// immediately instead of waiting for the next poll timeout
this.eventQueue.offer(new NettyEvent(null, null, null));
super.shutdown(interrupt);
}

@Override
public String getServiceName() {
return NettyEventExecutor.class.getSimpleName();
Expand Down