Use commons i18n for disk messages

luoluoyuyu · luoluoyuyu · commit 4a653a563fc6 · 2026-06-02T18:05:56.000+08:00
diff --git a/iotdb-core/node-commons/src/main/i18n/en/org/apache/iotdb/commons/i18n/UtilMessages.java b/iotdb-core/node-commons/src/main/i18n/en/org/apache/iotdb/commons/i18n/UtilMessages.java
@@ -107,6 +107,18 @@ public final class UtilMessages {
   public static final String UNEXPECTED_ERROR_CHECKING_DISK_SPACE =
       "Unexpected error checking disk space for {}";
 
+  // ======================== FolderManager ========================
+
+  public static final String ALL_FOLDERS_FULL_CHANGE_TO_READ_ONLY =
+      "All folders are full, change system mode to read-only.";
+  public static final String FAILED_TO_PROCESS_FOLDER = "Failed to process folder {}";
+  public static final String FAILED_TO_READ_FILE_STORE_PATH =
+      "Failed to read file store path '{}'";
+  public static final String DISK_SPACE_INSUFFICIENT_READ_ONLY =
+      "Disk space is insufficient, change system mode to read-only.";
+  public static final String CANNOT_CALCULATE_OCCUPIED_SPACE =
+      "Cannot calculate occupied space of folder {}";
+
   // ======================== NodeUrlUtils ========================
 
   public static final String BAD_CONFIG_NODE_URL = "Bad ConfigNode url: {}";
diff --git a/iotdb-core/node-commons/src/main/i18n/zh/org/apache/iotdb/commons/i18n/UtilMessages.java b/iotdb-core/node-commons/src/main/i18n/zh/org/apache/iotdb/commons/i18n/UtilMessages.java
@@ -105,6 +105,18 @@ public final class UtilMessages {
   public static final String UNEXPECTED_ERROR_CHECKING_DISK_SPACE =
       "检查 {} 的磁盘空间时发生意外错误";
 
+  // ======================== FolderManager ========================
+
+  public static final String ALL_FOLDERS_FULL_CHANGE_TO_READ_ONLY =
+      "所有文件夹空间均已耗尽，系统切换为只读模式。";
+  public static final String FAILED_TO_PROCESS_FOLDER = "处理文件夹 {} 失败";
+  public static final String FAILED_TO_READ_FILE_STORE_PATH =
+      "读取文件存储路径 '{}' 失败";
+  public static final String DISK_SPACE_INSUFFICIENT_READ_ONLY =
+      "磁盘空间不足，系统切换为只读模式。";
+  public static final String CANNOT_CALCULATE_OCCUPIED_SPACE =
+      "无法计算文件夹 {} 的已占用空间";
+
   // ======================== NodeUrlUtils ========================
 
   public static final String BAD_CONFIG_NODE_URL = "ConfigNode URL 格式错误：{}";
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/disk/FolderManager.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/disk/FolderManager.java
@@ -28,6 +28,7 @@
 import org.apache.iotdb.commons.disk.strategy.RandomOnDiskUsableSpaceStrategy;
 import org.apache.iotdb.commons.disk.strategy.SequenceStrategy;
 import org.apache.iotdb.commons.exception.DiskSpaceInsufficientException;
+import org.apache.iotdb.commons.i18n.UtilMessages;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -86,7 +87,7 @@ public FolderManager(List<String> folders, DirectoryStrategyType type)
       this.selectStrategy.setFolders(folders);
       this.selectStrategy.setFoldersStates(foldersStates);
     } catch (DiskSpaceInsufficientException e) {
-      logger.error("All folders are full, change system mode to read-only.", e);
+      logger.error(UtilMessages.ALL_FOLDERS_FULL_CHANGE_TO_READ_ONLY, e);
       CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
       CommonDescriptor.getInstance().getConfig().setStatusReason(NodeStatus.DISK_FULL);
       throw e;
@@ -102,7 +103,7 @@ public String getNextFolder() throws DiskSpaceInsufficientException {
     try {
       return folders.get(selectStrategy.nextFolderIndex());
     } catch (DiskSpaceInsufficientException e) {
-      logger.error("All folders are full, change system mode to read-only.", e);
+      logger.error(UtilMessages.ALL_FOLDERS_FULL_CHANGE_TO_READ_ONLY, e);
       CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
       CommonDescriptor.getInstance().getConfig().setStatusReason(NodeStatus.DISK_FULL);
       throw e;
@@ -133,7 +134,7 @@ public <T, E extends Exception> T getNextWithRetry(ThrowingFunction<String, T, E
       try {
         folder = folders.get(selectStrategy.nextFolderIndex());
       } catch (DiskSpaceInsufficientException e) {
-        logger.error("All folders are full, change system mode to read-only.", e);
+        logger.error(UtilMessages.ALL_FOLDERS_FULL_CHANGE_TO_READ_ONLY, e);
         CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
         CommonDescriptor.getInstance().getConfig().setStatusReason(NodeStatus.DISK_FULL);
         throw e;
@@ -142,7 +143,7 @@ public <T, E extends Exception> T getNextWithRetry(ThrowingFunction<String, T, E
         return folderConsumer.apply(folder);
       } catch (Exception e) {
         updateFolderState(folder, FolderState.ABNORMAL);
-        logger.warn("Failed to process folder {}", folder);
+        logger.warn(UtilMessages.FAILED_TO_PROCESS_FOLDER, folder);
       }
     }
     throw new DiskSpaceInsufficientException(folders);
@@ -164,7 +165,7 @@ public String getFirstFolderOfSameDisk(String pathStr) {
         }
       }
     } catch (IOException e) {
-      logger.warn("Failed to read file store path '" + pathStr + "'", e);
+      logger.warn(UtilMessages.FAILED_TO_READ_FILE_STORE_PATH, pathStr, e);
     }
     return null;
   }
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/disk/strategy/DirectoryStrategy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/disk/strategy/DirectoryStrategy.java
@@ -22,6 +22,7 @@
 import org.apache.iotdb.commons.conf.CommonDescriptor;
 import org.apache.iotdb.commons.disk.FolderManager;
 import org.apache.iotdb.commons.exception.DiskSpaceInsufficientException;
+import org.apache.iotdb.commons.i18n.UtilMessages;
 import org.apache.iotdb.commons.utils.JVMCommonUtils;
 
 import org.slf4j.Logger;
@@ -60,7 +61,7 @@ public void setFolders(List<String> folders) throws DiskSpaceInsufficientExcepti
       }
     }
     if (!hasSpace) {
-      LOGGER.error("Disk space is insufficient, change system mode to read-only.");
+      LOGGER.error(UtilMessages.DISK_SPACE_INSUFFICIENT_READ_ONLY);
       CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
       throw new DiskSpaceInsufficientException(folders);
     }
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/disk/strategy/MinFolderOccupiedSpaceFirstStrategy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/disk/strategy/MinFolderOccupiedSpaceFirstStrategy.java
@@ -19,6 +19,7 @@
 package org.apache.iotdb.commons.disk.strategy;
 
 import org.apache.iotdb.commons.exception.DiskSpaceInsufficientException;
+import org.apache.iotdb.commons.i18n.UtilMessages;
 import org.apache.iotdb.commons.utils.JVMCommonUtils;
 
 import java.io.IOException;
@@ -47,7 +48,7 @@ private int getMinOccupiedSpaceFolder() throws DiskSpaceInsufficientException {
       try {
         space = JVMCommonUtils.getOccupiedSpace(folder);
       } catch (IOException e) {
-        LOGGER.error("Cannot calculate occupied space of folder {}", folder, e);
+        LOGGER.error(UtilMessages.CANNOT_CALCULATE_OCCUPIED_SPACE, folder, e);
         continue;
       }
       if (space < minSpace) {

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import org.apache.iotdb.commons.conf.CommonDescriptor;`
`23`	`23`	`import org.apache.iotdb.commons.disk.FolderManager;`
`24`	`24`	`import org.apache.iotdb.commons.exception.DiskSpaceInsufficientException;`
	`25`	`+import org.apache.iotdb.commons.i18n.UtilMessages;`
`25`	`26`	`import org.apache.iotdb.commons.utils.JVMCommonUtils;`
`26`	`27`
`27`	`28`	`import org.slf4j.Logger;`
`@@ -60,7 +61,7 @@ public void setFolders(List<String> folders) throws DiskSpaceInsufficientExcepti`
`60`	`61`	`}`
`61`	`62`	`}`
`62`	`63`	`if (!hasSpace) {`
`63`		`- LOGGER.error("Disk space is insufficient, change system mode to read-only.");`
	`64`	`+ LOGGER.error(UtilMessages.DISK_SPACE_INSUFFICIENT_READ_ONLY);`
`64`	`65`	`CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);`
`65`	`66`	`throw new DiskSpaceInsufficientException(folders);`
`66`	`67`	`}`