This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch cluster-
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/cluster- by this push:
new 22e7743 fix merge conflict
22e7743 is described below
commit 22e7743302ef533f967e25c1990fc8933dd6b605
Author: xiangdong huang <[email protected]>
AuthorDate: Tue Oct 5 16:20:56 2021 +0800
fix merge conflict
---
.../java/org/apache/iotdb/cluster/metadata/MetaPuller.java | 13 ++++++-------
.../java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 2 +-
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/MetaPuller.java
b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/MetaPuller.java
index 405bcc9..ca3f1f7 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/MetaPuller.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/MetaPuller.java
@@ -48,7 +48,6 @@ import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashMap;
@@ -189,7 +188,8 @@ public class MetaPuller {
List<IMeasurementSchema> schemas = null;
try {
schemas = pullMeasurementSchemas(node, request);
- } catch (IOException | TException e) {
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
logger.error(
"{}: Cannot pull timeseries schemas of {} and other {} paths from
{}",
metaGroupMember.getName(),
@@ -197,8 +197,7 @@ public class MetaPuller {
request.getPrefixPaths().size() - 1,
node,
e);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
+ } catch (Exception e) {
logger.error(
"{}: Cannot pull timeseries schemas of {} and other {} paths from
{}",
metaGroupMember.getName(),
@@ -369,7 +368,8 @@ public class MetaPuller {
List<TimeseriesSchema> schemas = null;
try {
schemas = pullTimeSeriesSchemas(node, request);
- } catch (IOException | TException e) {
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
logger.error(
"{}: Cannot pull timeseries schemas of {} and other {} paths from
{}",
metaGroupMember.getName(),
@@ -377,8 +377,7 @@ public class MetaPuller {
request.getPrefixPaths().size() - 1,
node,
e);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
+ } catch (Exception e) {
logger.error(
"{}: Cannot pull timeseries schemas of {} and other {} paths from
{}",
metaGroupMember.getName(),
diff --git
a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
index baf8af3..b72440b 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
@@ -332,7 +332,7 @@ public class IoTDBConfigCheck {
}
if
(!(properties.getProperty(TAG_ATTRIBUTE_FLUSH_INTERVAL).equals(tagAttributeFlushInterval)))
{
- printErrorLogAndExit(TAG_ATTRIBUTE_FLUSH_INTERVAL);
+ throwException(TAG_ATTRIBUTE_FLUSH_INTERVAL, tagAttributeFlushInterval);
}
if
(!(properties.getProperty(MAX_DEGREE_OF_INDEX_STRING).equals(maxDegreeOfIndexNode)))
{
