You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/12/30 11:41:07 UTC
[incubator-iotdb] 01/01: modify sync startup script
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch fix_sync
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 71017a7f7a2bbc14da3469dbbaad3687a1581f2e
Author: lta <li...@163.com>
AuthorDate: Mon Dec 30 19:40:23 2019 +0800
modify sync startup script
---
.../src/assembly/resources/tools/start-sync-client.bat | 2 +-
.../src/assembly/resources/tools/start-sync-client.sh | 2 +-
.../main/java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../iotdb/db/sync/sender/manage/SyncFileManager.java | 17 +++++++++++++++--
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/server/src/assembly/resources/tools/start-sync-client.bat b/server/src/assembly/resources/tools/start-sync-client.bat
index dc44fcd..6ddfbec 100755
--- a/server/src/assembly/resources/tools/start-sync-client.bat
+++ b/server/src/assembly/resources/tools/start-sync-client.bat
@@ -29,7 +29,7 @@ set IOTDB_CONF=%IOTDB_HOME%\conf
set IOTDB_LOGS=%IOTDB_HOME%\logs
-if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.sync.sender.transfer.DataTransferManager
+if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.sync.sender.transfer.SyncClient
if NOT DEFINED JAVA_HOME goto :err
@REM -----------------------------------------------------------------------------
diff --git a/server/src/assembly/resources/tools/start-sync-client.sh b/server/src/assembly/resources/tools/start-sync-client.sh
index a3ae56a..505f85c 100755
--- a/server/src/assembly/resources/tools/start-sync-client.sh
+++ b/server/src/assembly/resources/tools/start-sync-client.sh
@@ -47,7 +47,7 @@ for f in ${IOTDB_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
-MAIN_CLASS=org.apache.iotdb.db.sync.sender.transfer.DataTransferManager
+MAIN_CLASS=org.apache.iotdb.db.sync.sender.transfer.SyncClient
"$JAVA" -DIOTDB_HOME=${IOTDB_HOME} -DTSFILE_HOME=${IOTDB_HOME} -DIOTDB_CONF=${IOTDB_CONF} -Dlogback.configurationFile=${IOTDB_CONF}/logback.xml $IOTDB_DERBY_OPTS $IOTDB_JMX_OPTS -Dname=SyncClient -cp "$CLASSPATH" "$MAIN_CLASS"
diff --git a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
index b191fa8..16b8d2d 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
@@ -120,7 +120,7 @@ public class IoTDB implements IoTDBMBean {
private void initMManager(){
MManager.getInstance().init();
IoTDBConfigDynamicAdapter.getInstance().setInitialized(true);
- logger.debug(
+ logger.info(
"After initializing, max memTable num is {}, tsFile threshold is {}, memtableSize is {}",
IoTDBDescriptor.getInstance().getConfig().getMaxMemtableNumber(),
IoTDBDescriptor.getInstance().getConfig().getTsFileSizeThreshold(),
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java b/server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java
index bb2532b..e401213 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java
@@ -35,6 +35,8 @@ import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.engine.merge.task.MergeTask;
import org.apache.iotdb.db.engine.modification.ModificationFile;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
+import org.apache.iotdb.db.exception.storageGroup.StorageGroupException;
+import org.apache.iotdb.db.metadata.MManager;
import org.apache.iotdb.db.sync.conf.SyncSenderDescriptor;
import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
import org.slf4j.Logger;
@@ -73,7 +75,7 @@ public class SyncFileManager implements ISyncFileManager {
private Map<String, Set<File>> toBeSyncedFilesMap;
private SyncFileManager() {
-
+ MManager.getInstance().init();
}
public static final SyncFileManager getInstance() {
@@ -94,7 +96,18 @@ public class SyncFileManager implements ISyncFileManager {
dataDir + File.separatorChar + IoTDBConstant.SEQUENCE_FLODER_NAME)
.listFiles();
for (File sgFolder : allSGFolders) {
- if (sgFolder.getName().equals(TsFileConstant.PATH_UPGRADE)){
+ if (!sgFolder.getName().startsWith(IoTDBConstant.PATH_ROOT) || sgFolder.getName()
+ .equals(TsFileConstant.PATH_UPGRADE)) {
+ continue;
+ }
+ try {
+ if (!MManager.getInstance().getStorageGroupNameByPath(sgFolder.getName())
+ .equals(sgFolder.getName())) {
+ // the folder is not a sg folder
+ continue;
+ }
+ } catch (StorageGroupException e) {
+ // the folder is not a sg folder
continue;
}
allSGs.add(sgFolder.getName());