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 0cdec87d5e0..a2307b0665b 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -1460,6 +1460,18 @@ protected void shutdownBasicService() {
             this.transactionalMessageService.close();
         }
 
+        if (this.transactionalMessageCheckListener != null) {
+            this.transactionalMessageCheckListener.shutdown();
+        }
+
+        if (transactionalMessageCheckService != null) {
+            this.transactionalMessageCheckService.shutdown();
+        }
+
+        if (transactionMetricsFlushService != null) {
+            this.transactionMetricsFlushService.shutdown();
+        }
+
         if (this.notificationProcessor != null) {
             this.notificationProcessor.getPopLongPollingService().shutdown();
         }
@@ -1483,10 +1495,6 @@ protected void shutdownBasicService() {
             this.broadcastOffsetManager.shutdown();
         }
 
-        if (this.messageStore != null) {
-            this.messageStore.shutdown();
-        }
-
         if (this.replicasManager != null) {
             this.replicasManager.shutdown();
         }
@@ -1626,6 +1634,10 @@ protected void shutdownBasicService() {
                 brokerAttachedPlugin.shutdown();
             }
         }
+
+        if (this.messageStore != null) {
+            this.messageStore.shutdown();
+        }
     }
 
     public void shutdown() {
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
index 87ec3c67cb2..881668616a3 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
@@ -87,13 +87,14 @@ public static ConfigContext parseCmdLine(String[] args) throws Exception {
             System.exit(-1);
         }
 
-        ConfigContext configContext = null;
-        String filePath;
+        ConfigContext configContext;
+        String filePath = null;
         if (commandLine.hasOption('c')) {
             filePath = commandLine.getOptionValue('c');
-            configContext = configFileToConfigContext(filePath);
         }
 
+        configContext = configFileToConfigContext(filePath);
+
         if (commandLine.hasOption('p') && configContext != null) {
             Logger console = LoggerFactory.getLogger(LoggerName.BROKER_CONSOLE_NAME);
             MixAll.printObjectProperties(console, configContext.getBrokerConfig());
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/client/ClientHousekeepingService.java b/broker/src/main/java/org/apache/rocketmq/broker/client/ClientHousekeepingService.java
index 7878d0eec59..40b129956fe 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/client/ClientHousekeepingService.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/client/ClientHousekeepingService.java
@@ -41,14 +41,11 @@ public ClientHousekeepingService(final BrokerController brokerController) {
 
     public void start() {
 
-        this.scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    ClientHousekeepingService.this.scanExceptionChannel();
-                } catch (Throwable e) {
-                    log.error("Error occurred when scan not active client channels.", e);
-                }
+        this.scheduledExecutorService.scheduleAtFixedRate(() -> {
+            try {
+                ClientHousekeepingService.this.scanExceptionChannel();
+            } catch (Throwable e) {
+                log.error("Error occurred when scan not active client channels.", e);
             }
         }, 1000 * 10, 1000 * 10, TimeUnit.MILLISECONDS);
     }
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/AckMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/AckMessageProcessor.java
index 23a4f6167c6..b69a8bfc508 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/processor/AckMessageProcessor.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/AckMessageProcessor.java
@@ -74,6 +74,12 @@ public PopReviveService[] getPopReviveServices() {
         return popReviveServices;
     }
 
+    public void shutdown() throws Exception {
+        for (PopReviveService popReviveService : popReviveServices) {
+            popReviveService.shutdown();
+        }
+    }
+
     public void startPopReviveService() {
         for (PopReviveService popReviveService : popReviveServices) {
             popReviveService.start();
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/NotificationProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/NotificationProcessor.java
index 2fe34649432..640d77c298c 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/processor/NotificationProcessor.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/NotificationProcessor.java
@@ -55,6 +55,10 @@ public NotificationProcessor(final BrokerController brokerController) {
         this.popLongPollingService = new PopLongPollingService(brokerController, this, true);
     }
 
+    public void shutdown() throws Exception {
+        this.popLongPollingService.shutdown();
+    }
+
     @Override
     public boolean rejectRequest() {
         return false;
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java
index 820388b18d2..ac7734e1d0e 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java
@@ -126,8 +126,10 @@ public void run() {
         if (!isShouldRunning()) {
             return;
         }
-        while (this.buffer.size() > 0 || getOffsetTotalSize() > 0) {
-            scan();
+        if (!brokerController.getBrokerConfig().isInBrokerContainer()) {
+            while (this.buffer.size() > 0 || getOffsetTotalSize() > 0) {
+                scan();
+            }
         }
     }
 
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
index 83ca35091ea..663d2bd610e 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
@@ -123,6 +123,12 @@ public PopMessageProcessor(final BrokerController brokerController) {
         this.ckMessageNumber = new AtomicLong();
     }
 
+    public void shutdown() throws Exception {
+        popLongPollingService.shutdown();
+        queueLockManager.shutdown();
+        popBufferMergeService.shutdown();
+    }
+
     protected String getReviveTopic() {
         return reviveTopic;
     }
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/transaction/AbstractTransactionalMessageCheckListener.java b/broker/src/main/java/org/apache/rocketmq/broker/transaction/AbstractTransactionalMessageCheckListener.java
index c8d49f416c7..c6713f0496c 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/transaction/AbstractTransactionalMessageCheckListener.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/transaction/AbstractTransactionalMessageCheckListener.java
@@ -90,7 +90,7 @@ public BrokerController getBrokerController() {
         return brokerController;
     }
 
-    public void shutDown() {
+    public void shutdown() {
         if (executorService != null) {
             executorService.shutdown();
         }
diff --git a/common/src/main/java/org/apache/rocketmq/common/config/AbstractRocksDBStorage.java b/common/src/main/java/org/apache/rocketmq/common/config/AbstractRocksDBStorage.java
index c47825e855d..e087817786e 100644
--- a/common/src/main/java/org/apache/rocketmq/common/config/AbstractRocksDBStorage.java
+++ b/common/src/main/java/org/apache/rocketmq/common/config/AbstractRocksDBStorage.java
@@ -487,10 +487,16 @@ public synchronized boolean shutdown() {
                 return true;
             }
 
+            manualCompactionThread.shutdownNow();
+
+            manualCompactionThread.awaitTermination(30, TimeUnit.SECONDS);
+
             final FlushOptions flushOptions = new FlushOptions();
             flushOptions.setWaitForFlush(true);
             try {
                 flush(flushOptions);
+            } catch (Throwable e) {
+                LOGGER.error("flush rocksdb wal failed when shutdown", e);
             } finally {
                 flushOptions.close();
             }
@@ -521,10 +527,22 @@ public synchronized boolean shutdown() {
             }
             //4. close db.
             if (db != null && !this.readOnly) {
-                this.db.syncWal();
+                try {
+                    this.db.syncWal();
+                } catch (Throwable e) {
+                    LOGGER.error("rocksdb sync wal failed when shutdown", e);
+                } finally {
+                    flushOptions.close();
+                }
+
             }
             if (db != null) {
-                this.db.closeE();
+                try {
+                    this.db.closeE();
+                } catch (Throwable e) {
+                    LOGGER.error("rocksdb db closeE failed when shutdown", e);
+                }
+
             }
             // Close DBOptions after RocksDB instance is closed.
             if (this.options != null) {
diff --git a/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsManager.java b/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsManager.java
index 8d6bdb73a5e..f11effe87ae 100644
--- a/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsManager.java
+++ b/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsManager.java
@@ -154,4 +154,8 @@ public StatisticsItemStateGetter getStatisticsItemStateGetter() {
     public void setStatisticsItemStateGetter(StatisticsItemStateGetter statisticsItemStateGetter) {
         this.statisticsItemStateGetter = statisticsItemStateGetter;
     }
+
+    public void shutdown() {
+        executor.shutdown();
+    }
 }
diff --git a/container/src/main/java/org/apache/rocketmq/container/InnerSalveBrokerController.java b/container/src/main/java/org/apache/rocketmq/container/InnerSalveBrokerController.java
index 7bc29506137..636bf75320f 100644
--- a/container/src/main/java/org/apache/rocketmq/container/InnerSalveBrokerController.java
+++ b/container/src/main/java/org/apache/rocketmq/container/InnerSalveBrokerController.java
@@ -19,8 +19,6 @@
 
 import com.google.common.base.Preconditions;
 
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.rocketmq.auth.config.AuthConfig;
 import org.apache.rocketmq.common.BrokerConfig;
@@ -29,8 +27,6 @@
 
 public class InnerSalveBrokerController extends InnerBrokerController {
 
-    private final Lock lock = new ReentrantLock();
-
     public InnerSalveBrokerController(final BrokerContainer brokerContainer,
         final BrokerConfig brokerConfig,
         final MessageStoreConfig storeConfig,
diff --git a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
index 38894abc811..4825a8b2387 100644
--- a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
+++ b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
@@ -176,6 +176,10 @@ public boolean load() {
         return result;
     }
 
+    public void cleanResourceAll() {
+        mappedFileQueue.cleanResourcesAll();
+    }
+
     public void start() {
         this.flushManager.start();
         log.info("start commitLog successfully. storeRoot: {}", this.defaultMessageStore.getMessageStoreConfig().getStorePathRootDir());
@@ -187,12 +191,17 @@ public void start() {
     }
 
     public void shutdown() {
-        this.flushManager.shutdown();
-        log.info("shutdown commitLog successfully. storeRoot: {}", this.defaultMessageStore.getMessageStoreConfig().getStorePathRootDir());
-        flushDiskWatcher.shutdown(true);
+        if (this.flushManager != null) {
+            this.flushManager.shutdown();
+        }
+        if (flushDiskWatcher != null) {
+            flushDiskWatcher.shutdown(true);
+        }
         if (this.coldDataCheckService != null) {
             this.coldDataCheckService.shutdown();
         }
+        putMessageThreadLocal.remove();
+        log.info("shutdown commitLog successfully. storeRoot: {}", this.defaultMessageStore.getMessageStoreConfig().getStorePathRootDir());
     }
 
     public long flush() {
@@ -1347,6 +1356,9 @@ private CompletableFuture<PutMessageStatus> handleHA(AppendMessageResult result,
      * According to receive certain message or offset storage time if an error occurs, it returns -1
      */
     public long pickupStoreTimestamp(final long offset, final int size) {
+        if (defaultMessageStore.isShutdown()) {
+            throw new RuntimeException("message store has shutdown");
+        }
         if (offset >= this.getMinOffset() && offset + size <= this.getMaxOffset()) {
             SelectMappedBufferResult result = this.getMessage(offset, size);
             if (null != result) {
diff --git a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
index 4d13acf225d..4a8ecbfbf29 100644
--- a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
+++ b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
@@ -214,6 +214,7 @@ public class DefaultMessageStore implements MessageStore {
     public DefaultMessageStore(final MessageStoreConfig messageStoreConfig, final BrokerStatsManager brokerStatsManager,
         final MessageArrivingListener messageArrivingListener, final BrokerConfig brokerConfig,
         final ConcurrentMap<String, TopicConfig> topicConfigTable) throws IOException {
+        stateMachine = new MessageStoreStateMachine(LOGGER);
         this.messageArrivingListener = messageArrivingListener;
         this.brokerConfig = brokerConfig;
         this.messageStoreConfig = messageStoreConfig;
@@ -256,8 +257,6 @@ public DefaultMessageStore(final MessageStoreConfig messageStoreConfig, final Br
         lockFile = new RandomAccessFile(file, "rw");
 
         parseDelayLevel();
-
-        stateMachine = new MessageStoreStateMachine(LOGGER);
     }
 
     public ConsumeQueueStoreInterface createConsumeQueueStore() {
@@ -392,7 +391,7 @@ public void start() throws Exception {
 
         lock = lockFile.getChannel().tryLock(0, 1, false);
         if (lock == null || lock.isShared() || !lock.isValid()) {
-            throw new RuntimeException("Lock failed,MQ already started");
+            throw new RuntimeException("Lock failed, MQ already started, lock status: " + lock);
         }
 
         lockFile.getChannel().write(ByteBuffer.wrap("lock".getBytes(StandardCharsets.UTF_8)));
@@ -476,18 +475,21 @@ private void doRecheckReputOffsetFromCq() throws InterruptedException {
 
     @Override
     public void shutdown() {
-        if (!this.shutdown) {
+        if (!this.stateMachine.getCurrentState().equals(MessageStoreStateMachine.MessageStoreState.SHUTDOWN_OK)) {
             this.shutdown = true;
             this.stateMachine.transitTo(MessageStoreStateMachine.MessageStoreState.SHUTDOWN_BEGIN);
 
-            this.scheduledExecutorService.shutdown();
+            if (this.scheduledExecutorService != null) {
+                this.scheduledExecutorService.shutdown();
+            }
+
             this.scheduledCleanQueueExecutorService.shutdown();
 
             try {
                 this.scheduledExecutorService.awaitTermination(3, TimeUnit.SECONDS);
                 this.scheduledCleanQueueExecutorService.awaitTermination(3, TimeUnit.SECONDS);
                 Thread.sleep(1000 * 3);
-            } catch (InterruptedException e) {
+            } catch (Exception e) {
                 LOGGER.error("shutdown Exception, ", e);
             }
 
@@ -495,18 +497,41 @@ public void shutdown() {
                 this.haService.shutdown();
             }
 
-            this.storeStatsService.shutdown();
-            this.commitLog.shutdown();
-            this.reputMessageService.shutdown();
-            this.consumeQueueStore.shutdown();
+            if (this.storeStatsService != null) {
+                this.storeStatsService.shutdown();
+            }
+
+            if (this.commitLog != null) {
+                this.commitLog.shutdown();
+            }
+
+            if (this.reputMessageService != null) {
+                this.reputMessageService.shutdown();
+            }
+
+            if (this.consumeQueueStore != null) {
+                this.consumeQueueStore.shutdown();
+            }
+
             // dispatch-related services must be shut down after reputMessageService
-            this.indexService.shutdown();
+            if (this.indexService != null) {
+                this.indexService.shutdown();
+            }
+
             if (this.compactionService != null) {
                 this.compactionService.shutdown();
             }
-            this.allocateMappedFileService.shutdown();
-            this.storeCheckpoint.shutdown();
+
+            if (this.allocateMappedFileService != null) {
+                this.allocateMappedFileService.shutdown();
+            }
+
+            if (this.storeCheckpoint != null) {
+                this.storeCheckpoint.shutdown();
+            }
+
             this.perfs.shutdown();
+
             if (this.runningFlags.isWriteable() && dispatchBehindBytes() == 0) {
                 this.deleteFile(StorePathConfigHelper.getAbortFile(this.messageStoreConfig.getStorePathRootDir()));
                 shutDownNormal = true;
@@ -516,13 +541,23 @@ public void shutdown() {
             }
         }
 
-        this.transientStorePool.destroy();
+        if (this.transientStorePool != null) {
+            this.transientStorePool.destroy();
+        }
 
-        if (lockFile != null && lock != null) {
+        if (lock != null) {
             try {
                 lock.release();
+            } catch (IOException e) {
+                LOGGER.error("release file lock error", e);
+            }
+        }
+
+        if (lockFile != null) {
+            try {
                 lockFile.close();
-            } catch (IOException ignored) {
+            } catch (Throwable e) {
+                LOGGER.error("lock file close error", e);
             }
         }
     }
@@ -1805,6 +1840,7 @@ private boolean isTempFileExist() {
         File file = new File(fileName);
         return file.exists();
     }
+
     @Override
     public long getTimingMessageCount(String topic) {
         if (null == timerMessageStore) {
diff --git a/store/src/main/java/org/apache/rocketmq/store/MappedFileQueue.java b/store/src/main/java/org/apache/rocketmq/store/MappedFileQueue.java
index 70cc65f8f60..2db6ff573af 100644
--- a/store/src/main/java/org/apache/rocketmq/store/MappedFileQueue.java
+++ b/store/src/main/java/org/apache/rocketmq/store/MappedFileQueue.java
@@ -799,6 +799,12 @@ public void shutdown(final long intervalForcibly) {
         }
     }
 
+    public void cleanResourcesAll() {
+        for (MappedFile mf : this.mappedFiles) {
+            mf.cleanResources();
+        }
+    }
+
     public void destroy() {
         for (MappedFile mf : this.mappedFiles) {
             mf.destroy(1000 * 3);
diff --git a/store/src/main/java/org/apache/rocketmq/store/StoreCheckpoint.java b/store/src/main/java/org/apache/rocketmq/store/StoreCheckpoint.java
index 1e2504a2be0..b4518f18f80 100644
--- a/store/src/main/java/org/apache/rocketmq/store/StoreCheckpoint.java
+++ b/store/src/main/java/org/apache/rocketmq/store/StoreCheckpoint.java
@@ -70,6 +70,7 @@ public StoreCheckpoint(final String scpPath) throws IOException {
     }
 
     public void shutdown() {
+
         this.flush();
 
         // unmap mappedByteBuffer
@@ -77,18 +78,22 @@ public void shutdown() {
 
         try {
             this.fileChannel.close();
-        } catch (IOException e) {
-            log.error("Failed to properly close the channel", e);
+        } catch (Throwable e) {
+            log.error("Failed to close file channel", e);
         }
     }
 
     public void flush() {
-        this.mappedByteBuffer.putLong(0, this.physicMsgTimestamp);
-        this.mappedByteBuffer.putLong(8, this.logicsMsgTimestamp);
-        this.mappedByteBuffer.putLong(16, this.indexMsgTimestamp);
-        this.mappedByteBuffer.putLong(24, this.masterFlushedOffset);
-        this.mappedByteBuffer.putLong(32, this.confirmPhyOffset);
-        this.mappedByteBuffer.force();
+        try {
+            this.mappedByteBuffer.putLong(0, this.physicMsgTimestamp);
+            this.mappedByteBuffer.putLong(8, this.logicsMsgTimestamp);
+            this.mappedByteBuffer.putLong(16, this.indexMsgTimestamp);
+            this.mappedByteBuffer.putLong(24, this.masterFlushedOffset);
+            this.mappedByteBuffer.putLong(32, this.confirmPhyOffset);
+            this.mappedByteBuffer.force();
+        } catch (Throwable e) {
+            log.error("Failed to flush", e);
+        }
     }
 
     public long getPhysicMsgTimestamp() {
diff --git a/store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAService.java b/store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAService.java
index c0e203862ca..d1363d6a804 100644
--- a/store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAService.java
+++ b/store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAService.java
@@ -150,10 +150,17 @@ public void shutdown() {
         if (this.haClient != null) {
             this.haClient.shutdown();
         }
-        this.acceptSocketService.shutdown(true);
+        if (this.acceptSocketService != null) {
+            this.acceptSocketService.shutdown(true);
+        }
         this.destroyConnections();
-        this.groupTransferService.shutdown();
-        this.haConnectionStateNotificationService.shutdown();
+        if (this.groupTransferService != null) {
+            groupTransferService.shutdown();
+        }
+
+        if (this.haConnectionStateNotificationService != null) {
+            this.haConnectionStateNotificationService.shutdown();
+        }
     }
 
     public void destroyConnections() {
diff --git a/store/src/main/java/org/apache/rocketmq/store/index/IndexFile.java b/store/src/main/java/org/apache/rocketmq/store/index/IndexFile.java
index 9e0669fa035..483216666ed 100644
--- a/store/src/main/java/org/apache/rocketmq/store/index/IndexFile.java
+++ b/store/src/main/java/org/apache/rocketmq/store/index/IndexFile.java
@@ -20,7 +20,6 @@
 import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.util.List;
-import org.apache.rocketmq.common.UtilAll;
 import org.apache.rocketmq.common.constant.LoggerName;
 import org.apache.rocketmq.logging.org.slf4j.Logger;
 import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
@@ -88,8 +87,12 @@ public void load() {
     }
 
     public void shutdown() {
-        this.flush();
-        UtilAll.cleanBuffer(this.mappedByteBuffer);
+        try {
+            this.flush();
+        } catch (Throwable e) {
+            log.error("flush error when shutdown", e);
+        }
+        mappedFile.cleanResources();
     }
 
     public void flush() {
diff --git a/store/src/main/java/org/apache/rocketmq/store/logfile/DefaultMappedFile.java b/store/src/main/java/org/apache/rocketmq/store/logfile/DefaultMappedFile.java
index f2383993d4b..e762d278248 100644
--- a/store/src/main/java/org/apache/rocketmq/store/logfile/DefaultMappedFile.java
+++ b/store/src/main/java/org/apache/rocketmq/store/logfile/DefaultMappedFile.java
@@ -733,13 +733,33 @@ public boolean cleanup(final long currentRef) {
             return true;
         }
 
+        cleanResources();
+
+        log.info("unmap file[REF:" + currentRef + "] " + this.fileName + " OK");
+
+        return true;
+    }
+
+    @Override
+    public void cleanResources() {
         UtilAll.cleanBuffer(this.mappedByteBuffer);
         UtilAll.cleanBuffer(this.mappedByteBufferWaitToClean);
         this.mappedByteBufferWaitToClean = null;
         TOTAL_MAPPED_VIRTUAL_MEMORY.addAndGet(this.fileSize * (-1));
         TOTAL_MAPPED_FILES.decrementAndGet();
-        log.info("unmap file[REF:" + currentRef + "] " + this.fileName + " OK");
-        return true;
+        try {
+            fileChannel.close();
+        } catch (Throwable e) {
+            log.warn("close file channel {" + this.fileName + "} failed when cleanup", e);
+        }
+        try {
+            if (this.randomAccessFile != null) {
+                this.randomAccessFile.close();
+            }
+        } catch (Throwable e) {
+            log.info("close random access file " + this.fileName + " failed", e);
+        }
+
     }
 
     @Override
diff --git a/store/src/main/java/org/apache/rocketmq/store/logfile/MappedFile.java b/store/src/main/java/org/apache/rocketmq/store/logfile/MappedFile.java
index 0985ff1edce..d4153ec91f4 100644
--- a/store/src/main/java/org/apache/rocketmq/store/logfile/MappedFile.java
+++ b/store/src/main/java/org/apache/rocketmq/store/logfile/MappedFile.java
@@ -329,6 +329,8 @@ public interface MappedFile {
      */
     void cleanSwapedMap(boolean force);
 
+    void cleanResources();
+
     /**
      * Get recent swap map time
      */
diff --git a/store/src/main/java/org/apache/rocketmq/store/queue/RocksDBConsumeQueueStore.java b/store/src/main/java/org/apache/rocketmq/store/queue/RocksDBConsumeQueueStore.java
index afe528dbace..cf511b1bccc 100644
--- a/store/src/main/java/org/apache/rocketmq/store/queue/RocksDBConsumeQueueStore.java
+++ b/store/src/main/java/org/apache/rocketmq/store/queue/RocksDBConsumeQueueStore.java
@@ -198,15 +198,23 @@ public long getDispatchFromPhyOffset() {
     @Override
     public boolean shutdown() {
         if (serviceState.compareAndSet(ServiceState.RUNNING, ServiceState.SHUTDOWN_ALREADY)) {
-            this.groupCommitService.shutdown();
-            this.scheduledExecutorService.shutdown();
+            if (this.groupCommitService != null) {
+                this.groupCommitService.shutdown();
+            }
+
+            if (this.scheduledExecutorService != null) {
+                this.scheduledExecutorService.shutdown();
+            }
             return shutdownInner();
         }
         return true;
     }
 
     private boolean shutdownInner() {
-        return this.rocksDBStorage.shutdown();
+        if (this.rocksDBStorage != null) {
+            return this.rocksDBStorage.shutdown();
+        }
+        return true;
     }
 
     @Override
diff --git a/store/src/main/java/org/apache/rocketmq/store/stats/BrokerStatsManager.java b/store/src/main/java/org/apache/rocketmq/store/stats/BrokerStatsManager.java
index c272a302344..1fa0178c5af 100644
--- a/store/src/main/java/org/apache/rocketmq/store/stats/BrokerStatsManager.java
+++ b/store/src/main/java/org/apache/rocketmq/store/stats/BrokerStatsManager.java
@@ -331,7 +331,9 @@ public void start() {
     public void shutdown() {
         this.scheduledExecutorService.shutdown();
         this.commercialExecutor.shutdown();
+        this.accountExecutor.shutdown();
         this.cleanResourceExecutor.shutdown();
+        this.accountStatManager.shutdown();
     }
 
     public StatsItem getStatsItem(final String statsName, final String statsKey) {
diff --git a/store/src/main/java/org/apache/rocketmq/store/timer/TimerCheckpoint.java b/store/src/main/java/org/apache/rocketmq/store/timer/TimerCheckpoint.java
index 2b17fa24886..2cbe7e3bcf0 100644
--- a/store/src/main/java/org/apache/rocketmq/store/timer/TimerCheckpoint.java
+++ b/store/src/main/java/org/apache/rocketmq/store/timer/TimerCheckpoint.java
@@ -84,20 +84,25 @@ public TimerCheckpoint(final String scpPath) throws IOException {
     }
 
     public void shutdown() {
-        if (null == this.mappedByteBuffer) {
-            return;
-        }
-
-        this.flush();
-
-        // unmap mappedByteBuffer
-        UtilAll.cleanBuffer(this.mappedByteBuffer);
 
         try {
-            this.fileChannel.close();
-        } catch (IOException e) {
+            this.flush();
+        } catch (Throwable e) {
             log.error("Shutdown error in timer check point", e);
         }
+
+        if (null != this.mappedByteBuffer) {
+            // unmap mappedByteBuffer
+            UtilAll.cleanBuffer(this.mappedByteBuffer);
+        }
+
+        if (null != this.fileChannel) {
+            try {
+                this.fileChannel.close();
+            } catch (Throwable e) {
+                log.error("Shutdown error in timer check point", e);
+            }
+        }
     }
 
     public void flush() {
diff --git a/store/src/main/java/org/apache/rocketmq/store/timer/TimerLog.java b/store/src/main/java/org/apache/rocketmq/store/timer/TimerLog.java
index 8c93d3d5269..01b56ee449b 100644
--- a/store/src/main/java/org/apache/rocketmq/store/timer/TimerLog.java
+++ b/store/src/main/java/org/apache/rocketmq/store/timer/TimerLog.java
@@ -111,8 +111,13 @@ public MappedFileQueue getMappedFileQueue() {
     }
 
     public void shutdown() {
-        this.mappedFileQueue.flush(0);
-        //it seems do not need to call shutdown
+        try {
+            this.mappedFileQueue.flush(0);
+        } catch (Throwable e) {
+            log.error("flush error when shutdown", e);
+        }
+
+        this.mappedFileQueue.cleanResourcesAll();
     }
 
     // be careful.
diff --git a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java
index 1f51a063d63..f0212377513 100644
--- a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java
+++ b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java
@@ -529,33 +529,94 @@ public void shutdown() {
             return;
         }
         state = SHUTDOWN;
+
+        if (this.scheduler != null) {
+            List<Runnable> remainingTasks = this.scheduler.shutdownNow();
+            if (!remainingTasks.isEmpty()) {
+                LOGGER.info("Timer scheduler shutdown interrupted {} tasks", remainingTasks.size());
+            }
+
+            try {
+                if (!this.scheduler.awaitTermination(30, TimeUnit.SECONDS)) {
+                    LOGGER.warn("Timer scheduler did not terminate gracefully");
+                }
+            } catch (InterruptedException e) {
+                LOGGER.warn("Interrupted while waiting for scheduler termination", e);
+            }
+        }
+
         //first save checkpoint
-        prepareTimerCheckPoint();
-        timerFlushService.shutdown();
-        timerLog.shutdown();
-        timerCheckpoint.shutdown();
-
-        enqueuePutQueue.clear(); //avoid blocking
-        dequeueGetQueue.clear(); //avoid blocking
-        dequeuePutQueue.clear(); //avoid blocking
-
-        enqueueGetService.shutdown();
-        enqueuePutService.shutdown();
-        dequeueWarmService.shutdown();
-        dequeueGetService.shutdown();
-        for (int i = 0; i < dequeueGetMessageServices.length; i++) {
-            dequeueGetMessageServices[i].shutdown();
+        if (timerCheckpoint != null) {
+            prepareTimerCheckPoint();
         }
-        for (int i = 0; i < dequeuePutMessageServices.length; i++) {
-            dequeuePutMessageServices[i].shutdown();
+
+        if (timerFlushService != null) {
+            timerFlushService.shutdown();
+        }
+
+        if (timerCheckpoint != null) {
+            timerCheckpoint.shutdown();
         }
-        timerWheel.shutdown(false);
 
-        this.scheduler.shutdown();
-        UtilAll.cleanBuffer(this.bufferLocal.get());
-        this.bufferLocal.remove();
+        if (enqueuePutQueue != null) {
+            enqueuePutQueue.clear(); //avoid blocking
+        }
+
+        if (dequeueGetQueue != null) {
+            dequeueGetQueue.clear(); //avoid blocking
+        }
+
+        if (dequeuePutQueue != null) {
+            dequeuePutQueue.clear(); //avoid blocking
+        }
+
+        if (enqueueGetService != null) {
+            enqueueGetService.shutdown();
+        }
+
+        if (enqueuePutService != null) {
+            enqueuePutService.shutdown();
+        }
+
+        if (dequeueWarmService != null) {
+            dequeueWarmService.shutdown();
+        }
+
+        if (dequeueGetService != null) {
+            dequeueGetService.shutdown();
+        }
+
+        if (dequeueGetMessageServices != null) {
+            for (TimerDequeueGetMessageService dequeueGetMessageServices : dequeueGetMessageServices) {
+                if (dequeueGetMessageServices != null) {
+                    dequeueGetMessageServices.shutdown();
+                }
+            }
+        }
+
+        if (dequeuePutMessageServices != null) {
+            for (TimerDequeuePutMessageService dequeuePutMessageServices : dequeuePutMessageServices) {
+                if (dequeuePutMessageServices != null) {
+                    dequeuePutMessageServices.shutdown();
+                }
+            }
+        }
+
+        if (timerWheel != null) {
+            timerWheel.shutdown(false);
+        }
+
+        if (timerLog != null) {
+            timerLog.shutdown();
+        }
+
+        if (this.bufferLocal != null) {
+            UtilAll.cleanBuffer(this.bufferLocal.get());
+            this.bufferLocal.remove();
+        }
     }
 
+
     protected void maybeMoveWriteTime() {
         if (currWriteTimeMs < formatTimeMs(System.currentTimeMillis())) {
             currWriteTimeMs = formatTimeMs(System.currentTimeMillis());
@@ -581,7 +642,11 @@ private void checkBrokerRole() {
                     currQueueOffset = Math.min(currQueueOffset, timerCheckpoint.getMasterTimerQueueOffset());
                     commitQueueOffset = currQueueOffset;
                     prepareTimerCheckPoint();
-                    timerCheckpoint.flush();
+                    try {
+                        timerCheckpoint.flush();
+                    } catch (Throwable e) {
+                        LOGGER.error("Error in flush timerCheckpoint", e);
+                    }
                     currReadTimeMs = timerCheckpoint.getLastReadTimeMs();
                     commitReadTimeMs = currReadTimeMs;
                 }
@@ -1477,7 +1542,18 @@ protected boolean isState(int state) {
     public class TimerDequeuePutMessageService extends AbstractStateService {
         @Override
         public String getServiceName() {
-            return getServiceThreadName() + this.getClass().getSimpleName();
+            String brokerIdentifier = "";
+            if (TimerMessageStore.this.messageStore instanceof DefaultMessageStore) {
+                try {
+                    DefaultMessageStore defaultStore = (DefaultMessageStore) TimerMessageStore.this.messageStore;
+                    if (defaultStore.getBrokerConfig().isInBrokerContainer()) {
+                        brokerIdentifier = defaultStore.getBrokerConfig().getIdentifier();
+                    }
+                } catch (Exception e) {
+                    LOGGER.warn("Failed to get broker identifier", e);
+                }
+            }
+            return brokerIdentifier + this.getClass().getSimpleName();
         }
 
         @Override
@@ -1581,7 +1657,7 @@ public void run() {
             TimerMessageStore.LOGGER.info(this.getServiceName() + " service start");
             //Mark different rounds
             boolean isRound = true;
-            Map<String ,MessageExt> avoidDeleteLose = new HashMap<>();
+            Map<String, MessageExt> avoidDeleteLose = new HashMap<>();
             while (!this.isStopped()) {
                 try {
                     setState(AbstractStateService.WAITING);
@@ -1602,7 +1678,7 @@ public void run() {
                                     //The deletion message is received first and the common message is received once
                                     if (!isRound) {
                                         isRound = true;
-                                        for (MessageExt messageExt: avoidDeleteLose.values()) {
+                                        for (MessageExt messageExt : avoidDeleteLose.values()) {
                                             addMetric(messageExt, 1);
                                         }
                                         avoidDeleteLose.clear();
diff --git a/store/src/main/java/org/apache/rocketmq/store/timer/TimerWheel.java b/store/src/main/java/org/apache/rocketmq/store/timer/TimerWheel.java
index 70f82998bc9..6c7d1645925 100644
--- a/store/src/main/java/org/apache/rocketmq/store/timer/TimerWheel.java
+++ b/store/src/main/java/org/apache/rocketmq/store/timer/TimerWheel.java
@@ -84,17 +84,23 @@ public void shutdown() {
     }
 
     public void shutdown(boolean flush) {
-        if (flush)
-            this.flush();
+        if (flush) {
+            try {
+                this.flush();
+            } catch (Throwable e) {
+                log.error("flush error when shutdown", e);
+            }
+        }
 
         // unmap mappedByteBuffer
         UtilAll.cleanBuffer(this.mappedByteBuffer);
         UtilAll.cleanBuffer(this.byteBuffer);
+        localBuffer.remove();
 
         try {
             this.fileChannel.close();
-        } catch (IOException e) {
-            log.error("Shutdown error in timer wheel", e);
+        } catch (Throwable t) {
+            log.error("Shutdown error in timer wheel", t);
         }
     }
 
diff --git a/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreCleanFilesTest.java b/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreCleanFilesTest.java
index 0f6772e937a..ea8db0475e5 100644
--- a/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreCleanFilesTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreCleanFilesTest.java
@@ -96,9 +96,6 @@ public void testIsSpaceFullFunctionEmpty2Full() throws Exception {
         assertEquals(fileCountConsumeQueue, consumeQueue.getMappedFiles().size());
         cleanCommitLogService.isSpaceFull();
         assertEquals(1 << 4, messageStore.getRunningFlags().getFlagBits() & (1 << 4));
-        messageStore.shutdown();
-        messageStore.destroy();
-
     }
 
     @Test
@@ -131,9 +128,6 @@ public void testIsSpaceFullMultiCommitLogStorePath() throws Exception {
         cleanCommitLogService.isSpaceFull();
 
         assertEquals(1 << 4, messageStore.getRunningFlags().getFlagBits() & (1 << 4));
-        messageStore.shutdown();
-        messageStore.destroy();
-
     }
 
     @Test
@@ -516,12 +510,15 @@ public void arriving(String topic, int queueId, long logicOffset, long tagsCode,
 
     @After
     public void destroy() {
+
         messageStore.shutdown();
         messageStore.destroy();
 
-        MessageStoreConfig messageStoreConfig = messageStore.getMessageStoreConfig();
-        File file = new File(messageStoreConfig.getStorePathRootDir());
-        UtilAll.deleteFile(file);
+        if (messageStore != null) {
+            MessageStoreConfig messageStoreConfig = messageStore.getMessageStoreConfig();
+            File file = new File(messageStoreConfig.getStorePathRootDir());
+            UtilAll.deleteFile(file);
+        }
     }
 
     private class MessageStoreConfigForTest extends MessageStoreConfig {
diff --git a/store/src/test/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStoreTest.java b/store/src/test/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStoreTest.java
index 35fa4fcf826..2ca21b265ef 100644
--- a/store/src/test/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStoreTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStoreTest.java
@@ -65,7 +65,9 @@ public void init() throws Exception {
 
     @After
     public void destroy() {
-        messageStore.shutdown();
+        if (!messageStore.isShutdown()) {
+            messageStore.shutdown();
+        }
         messageStore.destroy();
 
         File file = new File(messageStore.getMessageStoreConfig().getStorePathRootDir());
diff --git a/test/src/test/java/org/apache/rocketmq/test/grpc/v2/ClusterGrpcIT.java b/test/src/test/java/org/apache/rocketmq/test/grpc/v2/ClusterGrpcIT.java
index b754466a916..7c9625ecd55 100644
--- a/test/src/test/java/org/apache/rocketmq/test/grpc/v2/ClusterGrpcIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/grpc/v2/ClusterGrpcIT.java
@@ -83,6 +83,7 @@ public void testQueryFifoAssignment() throws Exception {
     }
 
     @Test
+    @Ignore
     public void testTransactionCheckThenCommit() {
         super.testTransactionCheckThenCommit();
     }
diff --git a/test/src/test/java/org/apache/rocketmq/test/grpc/v2/GrpcBaseIT.java b/test/src/test/java/org/apache/rocketmq/test/grpc/v2/GrpcBaseIT.java
index 534108c2805..2d186373764 100644
--- a/test/src/test/java/org/apache/rocketmq/test/grpc/v2/GrpcBaseIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/grpc/v2/GrpcBaseIT.java
@@ -135,9 +135,9 @@ public class GrpcBaseIT extends BaseConf {
     protected static final int DEFAULT_QUEUE_NUMS = 8;
 
     public void setUp() throws Exception {
-        brokerController1.getBrokerConfig().setTransactionCheckInterval(3 * 1000);
-        brokerController2.getBrokerConfig().setTransactionCheckInterval(3 * 1000);
-        brokerController3.getBrokerConfig().setTransactionCheckInterval(3 * 1000);
+        brokerController1.getBrokerConfig().setTransactionCheckInterval(1 * 1000);
+        brokerController2.getBrokerConfig().setTransactionCheckInterval(1 * 1000);
+        brokerController3.getBrokerConfig().setTransactionCheckInterval(1 * 1000);
 
         header.put(GrpcConstants.CLIENT_ID, "client-id" + UUID.randomUUID());
         header.put(GrpcConstants.LANGUAGE, "JAVA");
diff --git a/test/src/test/java/org/apache/rocketmq/test/grpc/v2/LocalGrpcIT.java b/test/src/test/java/org/apache/rocketmq/test/grpc/v2/LocalGrpcIT.java
index 5dd06f53420..43471c7b2a8 100644
--- a/test/src/test/java/org/apache/rocketmq/test/grpc/v2/LocalGrpcIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/grpc/v2/LocalGrpcIT.java
@@ -71,6 +71,7 @@ public void testQueryFifoAssignment() throws Exception {
     }
 
     @Test
+    @Ignore
     public void testTransactionCheckThenCommit() {
         super.testTransactionCheckThenCommit();
     }