You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/03/02 08:56:01 UTC
[iotdb] branch new_sync updated: [IOTDB-2615][IOTDB-2616] change new_sync's sync dir position and name (#5135)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch new_sync
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/new_sync by this push:
new b944ff5 [IOTDB-2615][IOTDB-2616] change new_sync's sync dir position and name (#5135)
b944ff5 is described below
commit b944ff57b7a421a470bbf3becc2929cffb849bae
Author: Jamber <ja...@sina.com>
AuthorDate: Wed Mar 2 16:55:19 2022 +0800
[IOTDB-2615][IOTDB-2616] change new_sync's sync dir position and name (#5135)
Co-authored-by: haiyi.zb <ha...@alibaba-inc.com>
---
.../db/newsync/sender/conf/.SenderConf.java.swp | Bin 0 -> 12288 bytes
.../iotdb/db/newsync/sender/conf/SenderConf.java | 20 +++++++++++---------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/newsync/sender/conf/.SenderConf.java.swp b/server/src/main/java/org/apache/iotdb/db/newsync/sender/conf/.SenderConf.java.swp
new file mode 100644
index 0000000..18a3081
Binary files /dev/null and b/server/src/main/java/org/apache/iotdb/db/newsync/sender/conf/.SenderConf.java.swp differ
diff --git a/server/src/main/java/org/apache/iotdb/db/newsync/sender/conf/SenderConf.java b/server/src/main/java/org/apache/iotdb/db/newsync/sender/conf/SenderConf.java
index f89201f..813f259 100644
--- a/server/src/main/java/org/apache/iotdb/db/newsync/sender/conf/SenderConf.java
+++ b/server/src/main/java/org/apache/iotdb/db/newsync/sender/conf/SenderConf.java
@@ -19,6 +19,7 @@
*/
package org.apache.iotdb.db.newsync.sender.conf;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.newsync.sender.pipe.Pipe;
import java.io.File;
@@ -27,28 +28,29 @@ public class SenderConf {
public static final String defaultPipeSinkIP = "127.0.0.1";
public static final int defaultPipeSinkPort = 6670;
- public static final String syncDir = "data" + File.separator + "sync";
+ public static final String syncBaseDir =
+ IoTDBDescriptor.getInstance().getConfig().getNewSyncDir();
- public static final String pipeDir = syncDir + File.separator + "sender pipe ";
+ public static final String pipeDir = syncBaseDir + File.separator + "sender_pipe ";
public static final String pipeCollectFinishLockName = "finishCollect.lock";
public static final Long defaultWaitingForTsFileCloseMilliseconds = 500L;
public static final Long defaultWaitingForTsFileRetryNumber = 10L;
public static final Long defaultWaitingForDeregisterMilliseconds = 100L;
- public static final String tsFileDirName = "TsFile data";
+ public static final String tsFileDirName = "TsFile_data";
public static final String modsOffsetFileSuffix = ".offset";
- public static final String pipeLogDirName = "Pipe log";
- public static final String historyPipeLogName = "pipe data.log.history";
- public static final String realTimePipeLogNameSuffix = "-pipe data.log";
+ public static final String pipeLogDirName = "Pipe_log";
+ public static final String historyPipeLogName = "pipe_data.log.history";
+ public static final String realTimePipeLogNameSuffix = "-pipe_data.log";
public static final Long defaultPipeLogSizeInByte = 10485760L;
- public static final String removeSerialNumberLogName = "remove serial number.log";
+ public static final String removeSerialNumberLogName = "remove_serial_number.log";
- public static final String sysDir = syncDir + File.separator + "sys";
+ public static final String sysDir = syncBaseDir + File.separator + "sys";
public static final String senderLog = sysDir + File.separator + "senderService.log";
public static final String planSplitCharacter = ",";
public static final String senderLogSplitCharacter = " ";
public static String getPipeDir(Pipe pipe) {
- return pipeDir + pipe.getName() + " " + pipe.getCreateTime();
+ return pipeDir + "_" + pipe.getName() + "_" + pipe.getCreateTime();
}
public static String getRealTimePipeLogName(long serialNumber) {