This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new faa93b0f512 fix error when the wal dir is not exist (#12339)
faa93b0f512 is described below
commit faa93b0f5129662bc475bae9ce63942d5b15bd6a
Author: YuFengLiu <[email protected]>
AuthorDate: Thu Apr 18 09:58:10 2024 +0800
fix error when the wal dir is not exist (#12339)
* fix error when the wal dir is not exist
* spotless
* make getFileStore a new class
---
.../db/storageengine/rescon/disk/TierManager.java | 18 +-----
.../metrics/metricsets/system/SystemMetrics.java | 20 +------
.../apache/iotdb/metrics/utils/FileStoreUtils.java | 65 ++++++++++++++++++++++
3 files changed, 70 insertions(+), 33 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/TierManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/TierManager.java
index 927d22ba9ac..f338b2d3b19 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/TierManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/TierManager.java
@@ -26,6 +26,7 @@ import
org.apache.iotdb.db.storageengine.rescon.disk.strategy.DirectoryStrategyT
import
org.apache.iotdb.db.storageengine.rescon.disk.strategy.MaxDiskUsableSpaceFirstStrategy;
import
org.apache.iotdb.db.storageengine.rescon.disk.strategy.MinFolderOccupiedSpaceFirstStrategy;
import
org.apache.iotdb.db.storageengine.rescon.disk.strategy.RandomOnDiskUsableSpaceStrategy;
+import org.apache.iotdb.metrics.utils.FileStoreUtils;
import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer;
import org.apache.iotdb.tsfile.fileSystem.FSType;
import org.apache.iotdb.tsfile.utils.FSUtils;
@@ -36,9 +37,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.nio.file.FileStore;
-import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -262,20 +261,7 @@ public class TierManager {
tierDiskSpace[tierLevel] = Long.MAX_VALUE;
break;
}
- // get the FileStore of each local dir
- Path path = Paths.get(dir);
- FileStore fileStore = null;
- try {
- fileStore = Files.getFileStore(path);
- } catch (IOException e) {
- // check parent if path is not exists
- path = path.getParent();
- try {
- fileStore = Files.getFileStore(path);
- } catch (IOException innerException) {
- logger.error("Failed to get storage path of {}, because", dir,
innerException);
- }
- }
+ FileStore fileStore = FileStoreUtils.getFileStore(dir);
// update space info
if (fileStore != null && !tierFileStores.contains(fileStore)) {
tierFileStores.add(fileStore);
diff --git
a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/system/SystemMetrics.java
b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/system/SystemMetrics.java
index f23d4bb7034..131ff9f5ac8 100644
---
a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/system/SystemMetrics.java
+++
b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/system/SystemMetrics.java
@@ -24,6 +24,7 @@ import org.apache.iotdb.metrics.MetricConstant;
import org.apache.iotdb.metrics.config.MetricConfig;
import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
+import org.apache.iotdb.metrics.utils.FileStoreUtils;
import org.apache.iotdb.metrics.utils.MetricLevel;
import org.apache.iotdb.metrics.utils.MetricType;
import org.apache.iotdb.metrics.utils.SystemMetric;
@@ -40,9 +41,6 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.management.ManagementFactory;
import java.nio.file.FileStore;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -84,20 +82,8 @@ public class SystemMetrics implements IMetricSet {
if (!FSUtils.isLocal(diskDir)) {
continue;
}
- Path path = Paths.get(diskDir);
- FileStore fileStore = null;
- try {
- fileStore = Files.getFileStore(path);
- } catch (IOException e) {
- // check parent if path is not exists
- path = path.getParent();
- try {
- fileStore = Files.getFileStore(path);
- } catch (IOException innerException) {
- logger.error("Failed to get storage path of {}, because", diskDir,
innerException);
- }
- }
- if (null != fileStore) {
+ FileStore fileStore = FileStoreUtils.getFileStore(diskDir);
+ if (fileStore != null) {
fileStoreSet.add(fileStore);
}
}
diff --git
a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/FileStoreUtils.java
b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/FileStoreUtils.java
new file mode 100644
index 00000000000..1698f7d0ac1
--- /dev/null
+++
b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/FileStoreUtils.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.metrics.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.FileStore;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class FileStoreUtils {
+ private static final Logger logger =
LoggerFactory.getLogger(FileStoreUtils.class);
+
+ // get the FileStore of dir .if current dir is not exists, check parent dir.
+ // for example, the dn_wal_dirs default value is data/datanode/wal and
system will save the
+ // data in the relative path directory it indicates under the IoTDB folder.
+ // it will check the parent dir until find the existing dir.
+ // if the parent dir = null(when path = data in this example), it will use
the IoTDB folder.
+ public static FileStore getFileStore(String dir) {
+ Path path = Paths.get(dir);
+ FileStore fileStore = null;
+
+ while (fileStore == null && path != null) {
+ try {
+ fileStore = Files.getFileStore(path);
+ } catch (NoSuchFileException e) {
+ path = path.getParent();
+ } catch (IOException e) {
+ logger.warn("Failed to get storage path of {}, because", dir, e);
+ break;
+ }
+ }
+ // If the dir is a relative dir, final use the IoTDB folder.
+ if (path == null) {
+ path = Paths.get("./");
+ try {
+ fileStore = Files.getFileStore(path);
+ } catch (IOException innerException) {
+ logger.warn("Failed to get storage path of {}, because", dir,
innerException);
+ }
+ }
+ return fileStore;
+ }
+}
