From 07e720b908b196313c0c87f53e73c025674438ba Mon Sep 17 00:00:00 2001 From: wanghuaiyuan Date: Tue, 21 Jan 2025 07:44:33 +0800 Subject: [PATCH] fix fail test --- .../java/org/apache/rocketmq/broker/BrokerController.java | 2 ++ .../rocketmq/broker/processor/AdminBrokerProcessor.java | 3 +-- .../store/timer/rocksdb/TimerMessageRocksDBStore.java | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java index fa60d87e624..006695c6bc8 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java @@ -2577,4 +2577,6 @@ public ColdDataCgCtrService getColdDataCgCtrService() { public void setColdDataCgCtrService(ColdDataCgCtrService coldDataCgCtrService) { this.coldDataCgCtrService = coldDataCgCtrService; } + + } diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java index 2496918b493..a9b913192fa 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java @@ -2674,9 +2674,8 @@ private RemotingCommand fetchAllConsumeStatsInBroker(ChannelHandlerContext ctx, group, topic, i); - if (consumerOffset < 0) { + if (consumerOffset < 0) consumerOffset = 0; - } offsetWrapper.setBrokerOffset(brokerOffset); offsetWrapper.setConsumerOffset(consumerOffset); diff --git a/store/src/main/java/org/apache/rocketmq/store/timer/rocksdb/TimerMessageRocksDBStore.java b/store/src/main/java/org/apache/rocketmq/store/timer/rocksdb/TimerMessageRocksDBStore.java index f6a95ea7639..dc99d34f202 100644 --- a/store/src/main/java/org/apache/rocketmq/store/timer/rocksdb/TimerMessageRocksDBStore.java +++ b/store/src/main/java/org/apache/rocketmq/store/timer/rocksdb/TimerMessageRocksDBStore.java @@ -184,9 +184,7 @@ public void shutdown() { } public void createTimer(byte[] columnFamily) { - for (int i = 0; i < storeConfig.getTimerGetMessageThreadNum(); i++) { - this.timerGetMessageServices.add(new TimerGetMessageService(columnFamily)); - } + this.timerGetMessageServices.add(new TimerGetMessageService(columnFamily)); this.timerWarmServices.add(new TimerWarmService(columnFamily)); } // ----------------------------------------------------------------------------------------------------------------