[rocketmq] branch develop updated: [ISSUE #2280] Disk ratio return -1.0 when cluster deployed on DLedger mode

[jinrongtong]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 2f14aa5  [ISSUE #2280] Disk ratio return -1.0 when cluster deployed on 
DLedger mode
2f14aa5 is described below

commit 2f14aa509d20b7f010364a7c278d546c22c80639
Author: 张旭 <maixiaoha...@gmail.com>
AuthorDate: Fri Sep 4 16:09:03 2020 +0800

    [ISSUE #2280] Disk ratio return -1.0 when cluster deployed on DLedger mode
---
 .../org/apache/rocketmq/store/DefaultMessageStore.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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 87af932..5462e76 100644
--- a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
+++ b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
@@ -804,13 +804,22 @@ public class DefaultMessageStore implements MessageStore {
         return this.storeStatsService.toString();
     }
 
+    private String getStorePathPhysic() {
+        String storePathPhysic = "";
+        if 
(DefaultMessageStore.this.getMessageStoreConfig().isEnableDLegerCommitLog()) {
+            storePathPhysic = 
((DLedgerCommitLog)DefaultMessageStore.this.getCommitLog()).getdLedgerServer().getdLedgerConfig().getDataStorePath();
+        } else {
+            storePathPhysic = 
DefaultMessageStore.this.getMessageStoreConfig().getStorePathCommitLog();
+        }
+        return storePathPhysic;
+    }
+
     @Override
     public HashMap<String, String> getRuntimeInfo() {
         HashMap<String, String> result = 
this.storeStatsService.getRuntimeInfo();
 
         {
-            String storePathPhysic = 
DefaultMessageStore.this.getMessageStoreConfig().getStorePathCommitLog();
-            double physicRatio = 
UtilAll.getDiskPartitionSpaceUsedPercent(storePathPhysic);
+            double physicRatio = 
UtilAll.getDiskPartitionSpaceUsedPercent(getStorePathPhysic());
             result.put(RunningStats.commitLogDiskRatio.name(), 
String.valueOf(physicRatio));
 
         }
@@ -1676,8 +1685,7 @@ public class DefaultMessageStore implements MessageStore {
             cleanImmediately = false;
 
             {
-                String storePathPhysic = 
DefaultMessageStore.this.getMessageStoreConfig().getStorePathCommitLog();
-                double physicRatio = 
UtilAll.getDiskPartitionSpaceUsedPercent(storePathPhysic);
+                double physicRatio = 
UtilAll.getDiskPartitionSpaceUsedPercent(getStorePathPhysic());
                 if (physicRatio > diskSpaceWarningLevelRatio) {
                     boolean diskok = 
DefaultMessageStore.this.runningFlags.getAndMakeDiskFull();
                     if (diskok) {