You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by wa...@apache.org on 2021/08/21 02:36:45 UTC
[iotdb] branch master updated: Cherry Pick some cluster bug-fixs
from rel/0.12 to master (#3800)
This is an automated email from the ASF dual-hosted git repository.
wangchao316 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 94780ea Cherry Pick some cluster bug-fixs from rel/0.12 to master (#3800)
94780ea is described below
commit 94780ea4a686e56927691fb08d4a53d342785336
Author: Potato <TX...@gmail.com>
AuthorDate: Fri Aug 20 21:36:20 2021 -0500
Cherry Pick some cluster bug-fixs from rel/0.12 to master (#3800)
Cherry Pick some cluster bug-fixs from rel/0.12 to master
---
.../apache/iotdb/cluster/coordinator/Coordinator.java | 3 +--
.../org/apache/iotdb/cluster/metadata/CMManager.java | 6 +++++-
.../iotdb/cluster/server/MetaClusterServer.java | 1 +
.../java/org/apache/iotdb/db/metadata/MManager.java | 19 ++++++++++++++-----
.../main/java/org/apache/iotdb/db/service/IoTDB.java | 9 +++++++++
.../main/java/org/apache/iotdb/session/Session.java | 2 +-
6 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java b/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java
index f4a28c2..b388f76 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java
@@ -451,8 +451,7 @@ public class Coordinator {
// e.g., an InsertTabletPlan contains 3 rows, row1 and row3 belong to NodeA and row2
// belongs to NodeB, when NodeA returns a success while NodeB returns a failure, the
// failure and success should be placed into proper positions in TSStatus.subStatus
- if (plan instanceof InsertTabletPlan
- || plan instanceof InsertMultiTabletPlan
+ if (plan instanceof InsertMultiTabletPlan
|| plan instanceof CreateMultiTimeSeriesPlan
|| plan instanceof InsertRowsPlan) {
status = forwardMultiSubPlan(planGroupMap, plan);
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
index 27325af..fa06e12 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
@@ -855,7 +855,11 @@ public class CMManager extends MManager {
}
if (result.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()
&& result.getCode() != TSStatusCode.PATH_ALREADY_EXIST_ERROR.getStatusCode()
- && result.getCode() != TSStatusCode.NEED_REDIRECTION.getStatusCode()) {
+ && result.getCode() != TSStatusCode.NEED_REDIRECTION.getStatusCode()
+ && !(result.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()
+ && result.getSubStatus().stream()
+ .allMatch(
+ s -> s.getCode() == TSStatusCode.PATH_ALREADY_EXIST_ERROR.getStatusCode()))) {
logger.error(
"{} failed to execute create timeseries {}: {}",
metaGroupMember.getThisNode(),
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/MetaClusterServer.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/MetaClusterServer.java
index fce7a87..ec19cad 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/MetaClusterServer.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/MetaClusterServer.java
@@ -96,6 +96,7 @@ public class MetaClusterServer extends RaftServer
metaHeartbeatServer.start();
ioTDB = new IoTDB();
IoTDB.setMetaManager(CMManager.getInstance());
+ IoTDB.setClusterMode();
((CMManager) IoTDB.metaManager).setMetaGroupMember(member);
((CMManager) IoTDB.metaManager).setCoordinator(coordinator);
ioTDB.active();
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
index 71045db..9368523 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
@@ -57,6 +57,7 @@ import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.dataset.ShowDevicesResult;
import org.apache.iotdb.db.query.dataset.ShowTimeSeriesResult;
import org.apache.iotdb.db.rescon.MemTableManager;
+import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.RandomDeleteCache;
import org.apache.iotdb.db.utils.SchemaUtils;
import org.apache.iotdb.db.utils.TestOnly;
@@ -1830,11 +1831,19 @@ public class MManager {
}
}
} catch (MetadataException e) {
- logger.warn(
- "meet error when check {}.{}, message: {}",
- deviceId,
- measurementList[i],
- e.getMessage());
+ if (IoTDB.isClusterMode()) {
+ logger.debug(
+ "meet error when check {}.{}, message: {}",
+ deviceId,
+ measurementList[i],
+ e.getMessage());
+ } else {
+ logger.warn(
+ "meet error when check {}.{}, message: {}",
+ deviceId,
+ measurementList[i],
+ e.getMessage());
+ }
if (config.isEnablePartialInsert()) {
// mark failed measurement
plan.markFailedMeasurementInsertion(i, e);
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 c548019..d26fa4b 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
@@ -55,6 +55,7 @@ public class IoTDB implements IoTDBMBean {
String.format("%s:%s=%s", IoTDBConstant.IOTDB_PACKAGE, IoTDBConstant.JMX_TYPE, "IoTDB");
private RegisterManager registerManager = new RegisterManager();
public static MManager metaManager = MManager.getInstance();
+ private static boolean clusterMode = false;
public static IoTDB getInstance() {
return IoTDBHolder.INSTANCE;
@@ -74,6 +75,14 @@ public class IoTDB implements IoTDBMBean {
IoTDB.metaManager = metaManager;
}
+ public static void setClusterMode() {
+ IoTDB.clusterMode = true;
+ }
+
+ public static boolean isClusterMode() {
+ return IoTDB.clusterMode;
+ }
+
public void active() {
StartupChecks checks = new StartupChecks().withDefaultTest();
try {
diff --git a/session/src/main/java/org/apache/iotdb/session/Session.java b/session/src/main/java/org/apache/iotdb/session/Session.java
index d9fb56b..2dd122f 100644
--- a/session/src/main/java/org/apache/iotdb/session/Session.java
+++ b/session/src/main/java/org/apache/iotdb/session/Session.java
@@ -589,7 +589,7 @@ public class Session {
private SessionDataSet executeStatementMayRedirect(String sql, long timeoutInMs)
throws StatementExecutionException, IoTDBConnectionException {
try {
- logger.info("{} execute sql {}", defaultSessionConnection.getEndPoint(), sql);
+ logger.debug("{} execute sql {}", defaultSessionConnection.getEndPoint(), sql);
return defaultSessionConnection.executeQueryStatement(sql, timeoutInMs);
} catch (RedirectException e) {
handleQueryRedirection(e.getEndPoint());