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
Original file line number Diff line number Diff line change
Expand Up @@ -393,11 +393,26 @@ protected void cleanExpiredRequestInQueue(ThreadPoolExecutor threadPoolExecutor,
} else {
break;
}
} catch (Throwable ignored) {
} catch (Throwable t) {
log.warn("clean expired remoting request failed. queueSize:{}, maxWaitTimeMillsInQueue:{}",
safeQueueSize(threadPoolExecutor), maxWaitTimeMillsInQueue, t);
break;
}
}
}

private int safeQueueSize(ThreadPoolExecutor threadPoolExecutor) {
try {
BlockingQueue<Runnable> queue = threadPoolExecutor == null ? null : threadPoolExecutor.getQueue();
if (queue == null) {
return -1;
}
return queue.size();
} catch (Throwable ignored) {
return -1;
}
}

private RequestTask castRunnable(final Runnable runnable) {
try {
if (runnable instanceof FutureTaskExt) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.rocketmq.proxy.remoting;

import java.util.concurrent.ThreadPoolExecutor;
import org.apache.rocketmq.remoting.RemotingServer;
import org.apache.rocketmq.remoting.protocol.RequestHeaderRegistry;
import org.junit.Test;
Expand Down Expand Up @@ -44,4 +45,15 @@ public void shouldInitializeRequestHeaderRegistryWhenRegisteringProcessors() {
verify(requestHeaderRegistry).initialize();
}
}

@Test(timeout = 1000)
public void testCleanExpiredRequestInQueueBreaksWhenQueueAccessFails() {
RemotingProtocolServer server = Mockito.mock(RemotingProtocolServer.class, Mockito.CALLS_REAL_METHODS);
ThreadPoolExecutor executor = Mockito.mock(ThreadPoolExecutor.class);
Mockito.when(executor.getQueue()).thenThrow(new RuntimeException("queue unavailable"));

server.cleanExpiredRequestInQueue(executor, 1);

Mockito.verify(executor, Mockito.atMost(2)).getQueue();
}
}
Loading