From f1ef1f38b01e659ecc7ee0fecaa60ce319458700 Mon Sep 17 00:00:00 2001 From: qianye Date: Tue, 29 Apr 2025 16:46:04 +0800 Subject: [PATCH 1/2] fix --- .../client/trace/AsyncTraceDispatcher.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/client/src/main/java/org/apache/rocketmq/client/trace/AsyncTraceDispatcher.java b/client/src/main/java/org/apache/rocketmq/client/trace/AsyncTraceDispatcher.java index e321e1583d2..ece75514e1f 100644 --- a/client/src/main/java/org/apache/rocketmq/client/trace/AsyncTraceDispatcher.java +++ b/client/src/main/java/org/apache/rocketmq/client/trace/AsyncTraceDispatcher.java @@ -16,6 +16,19 @@ */ package org.apache.rocketmq.client.trace; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; import org.apache.rocketmq.client.AccessChannel; import org.apache.rocketmq.client.common.ThreadLocalIndex; import org.apache.rocketmq.client.exception.MQClientException; @@ -35,20 +48,6 @@ import org.apache.rocketmq.logging.org.slf4j.LoggerFactory; import org.apache.rocketmq.remoting.RPCHook; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; - import static org.apache.rocketmq.client.trace.TraceConstants.TRACE_INSTANCE_NAME; public class AsyncTraceDispatcher implements TraceDispatcher { @@ -254,9 +253,10 @@ public void run() { } catch (Throwable e) { log.error("flushTraceContext error", e); } - } - if (AsyncTraceDispatcher.this.stopped) { - this.stopped = true; + + if (AsyncTraceDispatcher.this.stopped) { + this.stopped = true; + } } } } From 1ac32a38eb1f42610f0f7eb4d039ed0476d04a8f Mon Sep 17 00:00:00 2001 From: qianye Date: Tue, 29 Apr 2025 16:52:37 +0800 Subject: [PATCH 2/2] fix --- .../client/impl/consumer/ProcessQueueTest.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/client/src/test/java/org/apache/rocketmq/client/impl/consumer/ProcessQueueTest.java b/client/src/test/java/org/apache/rocketmq/client/impl/consumer/ProcessQueueTest.java index a8afd4a233a..dd7ffa757f8 100644 --- a/client/src/test/java/org/apache/rocketmq/client/impl/consumer/ProcessQueueTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/impl/consumer/ProcessQueueTest.java @@ -16,6 +16,11 @@ */ package org.apache.rocketmq.client.impl.consumer; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.TreeMap; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; import org.apache.rocketmq.client.exception.MQBrokerException; @@ -29,12 +34,6 @@ import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.TreeMap; - import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -158,7 +157,6 @@ public void testProcessQueue() { ProcessQueue processQueue2 = createProcessQueue(); assertEquals(processQueue1.getMsgAccCnt(), processQueue2.getMsgAccCnt()); assertEquals(processQueue1.getTryUnlockTimes(), processQueue2.getTryUnlockTimes()); - assertEquals(processQueue1.getLastLockTimestamp(), processQueue2.getLastLockTimestamp()); assertEquals(processQueue1.getLastPullTimestamp(), processQueue2.getLastPullTimestamp()); }