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/11/13 05:36:11 UTC
[incubator-iotdb] branch master updated: Remove stop after
exception in sync module (#548)
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new edf14ba Remove stop after exception in sync module (#548)
edf14ba is described below
commit edf14ba4a8f84e6f8cb30fe54e8f00c15f05c0a6
Author: Tianan Li <li...@163.com>
AuthorDate: Wed Nov 13 13:36:00 2019 +0800
Remove stop after exception in sync module (#548)
* remove stop after unable connection
---
.../org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java | 2 +-
.../org/apache/iotdb/db/sync/sender/transfer/DataTransferManager.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java
index 5d7cf15..d0c3d27 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java
@@ -295,7 +295,7 @@ public class SyncServiceImpl implements SyncService.Iface {
}
private SyncStatus getSuccessResult() {
- return new SyncStatus(SyncConstant.SUCCESS_CODE, null);
+ return new SyncStatus(SyncConstant.SUCCESS_CODE, "");
}
private SyncStatus getErrorResult(String errorMsg) {
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/DataTransferManager.java b/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/DataTransferManager.java
index dc04a1a..fd42bdd 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/DataTransferManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/DataTransferManager.java
@@ -204,7 +204,6 @@ public class DataTransferManager implements IDataTransferManager {
syncAll();
} catch (SyncConnectionException | IOException | TException e) {
logger.error("Sync failed", e);
- stop();
}
}, SyncConstant.SYNC_PROCESS_DELAY, SyncConstant.SYNC_PROCESS_PERIOD, TimeUnit.SECONDS);
}