This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch rc/1.3.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rc/1.3.3 by this push:
new 2a7b8980070 Pipe: Reduced the recover time in cleaning tsFile
hardlinks (#13219)
2a7b8980070 is described below
commit 2a7b89800707ca5331fec4ba0754dca2887d27a9
Author: Caideyipi <[email protected]>
AuthorDate: Mon Aug 19 15:24:11 2024 +0800
Pipe: Reduced the recover time in cleaning tsFile hardlinks (#13219)
---
...taNodeHardlinkOrCopiedFileDirStartupCleaner.java | 21 +++++++++------------
.../apache/iotdb/commons/schema/SchemaConstant.java | 1 +
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner.java
index c6d4aefc705..a97ae5b1d47 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner.java
@@ -24,7 +24,6 @@ import
org.apache.iotdb.commons.pipe.resource.PipeSnapshotResourceManager;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.DirectoryFileFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,22 +45,20 @@ public class
PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner {
private static void cleanTsFileDir() {
for (final String dataDir :
IoTDBDescriptor.getInstance().getConfig().getDataDirs()) {
- for (final File file :
- FileUtils.listFilesAndDirs(
- new File(dataDir), DirectoryFileFilter.INSTANCE,
DirectoryFileFilter.INSTANCE)) {
- if (file.isDirectory()
- &&
file.getName().equals(PipeConfig.getInstance().getPipeHardlinkBaseDirName())) {
- LOGGER.info(
- "Pipe hardlink dir found, deleting it: {}, result: {}",
- file,
- FileUtils.deleteQuietly(file));
- }
+ final File pipeHardLinkDir =
+ new File(
+ dataDir + File.separator +
PipeConfig.getInstance().getPipeHardlinkBaseDirName());
+ if (pipeHardLinkDir.isDirectory()) {
+ LOGGER.info(
+ "Pipe hardlink dir found, deleting it: {}, result: {}",
+ pipeHardLinkDir,
+ FileUtils.deleteQuietly(pipeHardLinkDir));
}
}
}
private static void cleanSnapshotDir() {
- File pipeConsensusDir =
+ final File pipeConsensusDir =
new File(
IoTDBDescriptor.getInstance().getConfig().getConsensusDir()
+ File.separator
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/SchemaConstant.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/SchemaConstant.java
index d7b40a37d84..c668b609c6c 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/SchemaConstant.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/SchemaConstant.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.commons.schema;
import org.apache.iotdb.commons.conf.IoTDBConstant;