You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/06/28 03:52:54 UTC
[incubator-iotdb] branch feature_async_close_tsfile updated: remove
unthrowed exception
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/feature_async_close_tsfile by this push:
new bc24fa8 remove unthrowed exception
bc24fa8 is described below
commit bc24fa86d47f80bdd903cd2e6ad7d38e467fcf77
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Jun 28 11:52:42 2019 +0800
remove unthrowed exception
---
.../iotdb/db/engine/memcontrol/FlushPartialPolicy.java | 6 +-----
.../iotdb/db/engine/memcontrol/ForceFLushAllPolicy.java | 8 +-------
.../org/apache/iotdb/db/monitor/collector/FileSize.java | 2 +-
.../java/org/apache/iotdb/db/service/TSServiceImpl.java | 14 ++------------
.../java/org/apache/iotdb/db/utils/EnvironmentUtils.java | 10 +++-------
5 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/FlushPartialPolicy.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/FlushPartialPolicy.java
index 08567fe..41387b4 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/FlushPartialPolicy.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/FlushPartialPolicy.java
@@ -61,11 +61,7 @@ public class FlushPartialPolicy implements Policy {
private Thread createWorkerThread() {
return new Thread(() -> {
- try {
- FileNodeManagerV2.getInstance().syncCloseAllProcessor();
- } catch (FileNodeManagerException e) {
- LOGGER.error("sync close all file node processor failed", e);
- }
+ FileNodeManagerV2.getInstance().syncCloseAllProcessor();
try {
Thread.sleep(sleepInterval);
} catch (InterruptedException e) {
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/ForceFLushAllPolicy.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/ForceFLushAllPolicy.java
index e68e712..c7ccf04 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/ForceFLushAllPolicy.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/ForceFLushAllPolicy.java
@@ -56,13 +56,7 @@ public class ForceFLushAllPolicy implements Policy {
private Thread createWorkerThread() {
return new Thread(() ->
- {
- try {
- FileNodeManagerV2.getInstance().syncCloseAllProcessor();
- } catch (FileNodeManagerException e) {
- logger.error("sync close all file node processor failed", e);
- }
- },
+ FileNodeManagerV2.getInstance().syncCloseAllProcessor(),
ThreadName.FORCE_FLUSH_ALL_POLICY.getName());
}
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java b/iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
index e9ecba2..f2705ba 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
@@ -81,7 +81,7 @@ public class FileSize implements IStatistic {
fileNodeManager.addTimeSeries(path, TSDataType.valueOf(MonitorConstants.DATA_TYPE_INT64),
TSEncoding.valueOf("RLE"), CompressionType.valueOf(TSFileConfig.compressor),
Collections.emptyMap());
- } catch (FileNodeManagerException | ProcessorException e) {
+ } catch (FileNodeManagerException e) {
LOGGER.error("Register File Size Stats into fileNodeManager Failed.", e);
}
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 6104f2c..c5caa98 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -429,21 +429,11 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
statement = statement.toLowerCase();
switch (statement) {
case "flush":
- try {
- FileNodeManagerV2.getInstance().syncCloseAllProcessor();
- } catch (FileNodeManagerException e) {
- LOGGER.error("meet error while FileNodeManager closing all!", e);
- throw new IOException(e);
- }
+ FileNodeManagerV2.getInstance().syncCloseAllProcessor();
return true;
case "merge":
- try {
// TODO change to merge!!!
- FileNodeManagerV2.getInstance().syncCloseAllProcessor();
- } catch (FileNodeManagerException e) {
- LOGGER.error("meet error while FileNodeManager merging all!", e);
- throw new IOException(e);
- }
+ FileNodeManagerV2.getInstance().syncCloseAllProcessor();
return true;
default:
return false;
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
index ddc417a..8a56b42 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
@@ -72,13 +72,9 @@ public class EnvironmentUtils {
// tsFileConfig.duplicateIncompletedPage = false;
// clean filenode manager
- try {
- if (!FileNodeManagerV2.getInstance().deleteAll()) {
- LOGGER.error("Can't close the filenode manager in EnvironmentUtils");
- Assert.fail();
- }
- } catch (FileNodeManagerException e) {
- throw new IOException(e);
+ if (!FileNodeManagerV2.getInstance().deleteAll()) {
+ LOGGER.error("Can't close the filenode manager in EnvironmentUtils");
+ Assert.fail();
}
StatMonitor.getInstance().close();
FileNodeManagerV2.getInstance().resetFileNodeManager();