You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2023/01/10 02:43:08 UTC
[iotdb] branch master updated: [IOTDB-5328] Rename "REMOVE_DATANODE_PROCESS" in MIGRATE_REGION_PROCEDURE to "REGION_MIGRATE_PROCESS" (#8790)
This is an automated email from the ASF dual-hosted git repository.
caogaofei 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 7b1977330a [IOTDB-5328] Rename "REMOVE_DATANODE_PROCESS" in MIGRATE_REGION_PROCEDURE to "REGION_MIGRATE_PROCESS" (#8790)
7b1977330a is described below
commit 7b1977330a831e5e5af4b0d776df16cb889aa051
Author: Caideyipi <87...@users.noreply.github.com>
AuthorDate: Tue Jan 10 10:43:02 2023 +0800
[IOTDB-5328] Rename "REMOVE_DATANODE_PROCESS" in MIGRATE_REGION_PROCEDURE to "REGION_MIGRATE_PROCESS" (#8790)
---
.../apache/iotdb/confignode/conf/ConfigNodeConstant.java | 1 +
.../apache/iotdb/confignode/manager/ProcedureManager.java | 2 +-
.../confignode/procedure/env/DataNodeRemoveHandler.java | 15 ++++++++-------
.../impl/statemachine/RegionMigrateProcedure.java | 15 +++++++--------
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConstant.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConstant.java
index b162ae7982..5ee02a2095 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConstant.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConstant.java
@@ -54,6 +54,7 @@ public class ConfigNodeConstant {
"Executed failed, check usage: <Node-id>/<internal_address>:<internal_port>";
public static final String REMOVE_DATANODE_PROCESS = "[REMOVE_DATANODE_PROCESS]";
+ public static final String REGION_MIGRATE_PROCESS = "[REGION_MIGRATE_PROCESS]";
public static final String IOTDB_FOREGROUND = "iotdb-foreground";
public static final String IOTDB_PIDFILE = "iotdb-pidfile";
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
index 17a9ea7fec..e92c5eb51f 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
@@ -439,7 +439,7 @@ public class ProcedureManager {
status.setMessage(
"Submit RegionMigrateProcedure failed, because the destDataNode "
+ migrateRegionReq.getToId()
- + " is ReadOnly.");
+ + " is ReadOnly or Unknown.");
return status;
}
this.executor.submitProcedure(
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
index 29cbe04500..5e9478b49c 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
@@ -50,6 +50,7 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
+import static org.apache.iotdb.confignode.conf.ConfigNodeConstant.REGION_MIGRATE_PROCESS;
import static org.apache.iotdb.confignode.conf.ConfigNodeConstant.REMOVE_DATANODE_PROCESS;
import static org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS;
import static org.apache.iotdb.consensus.ConsensusFactory.SIMPLE_CONSENSUS;
@@ -171,7 +172,7 @@ public class DataNodeRemoveHandler {
if (regionReplicaNodes.isEmpty()) {
LOGGER.warn(
"{}, Cannot find region replica nodes in createPeer, regionId: {}",
- REMOVE_DATANODE_PROCESS,
+ REGION_MIGRATE_PROCESS,
regionId);
status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
status.setMessage("Not find region replica nodes in createPeer, regionId: " + regionId);
@@ -203,13 +204,13 @@ public class DataNodeRemoveHandler {
LOGGER.info(
"{}, Send action createNewRegionPeer finished, regionId: {}, newPeerDataNodeId: {}",
- REMOVE_DATANODE_PROCESS,
+ REGION_MIGRATE_PROCESS,
regionId,
getIdWithRpcEndpoint(destDataNode));
if (isFailed(status)) {
LOGGER.error(
"{}, Send action createNewRegionPeer error, regionId: {}, newPeerDataNodeId: {}, result: {}",
- REMOVE_DATANODE_PROCESS,
+ REGION_MIGRATE_PROCESS,
regionId,
getIdWithRpcEndpoint(destDataNode),
status);
@@ -239,7 +240,7 @@ public class DataNodeRemoveHandler {
LOGGER.warn(
"{}, There are no other DataNodes could be selected to perform the add peer process, "
+ "please check RegionGroup: {} by show regions sql command",
- REMOVE_DATANODE_PROCESS,
+ REGION_MIGRATE_PROCESS,
regionId);
status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
status.setMessage(
@@ -259,7 +260,7 @@ public class DataNodeRemoveHandler {
DataNodeRequestType.ADD_REGION_PEER);
LOGGER.info(
"{}, Send action addRegionPeer finished, regionId: {}, rpcDataNode: {}, destDataNode: {}",
- REMOVE_DATANODE_PROCESS,
+ REGION_MIGRATE_PROCESS,
regionId,
getIdWithRpcEndpoint(selectedDataNode.get()),
getIdWithRpcEndpoint(destDataNode));
@@ -302,7 +303,7 @@ public class DataNodeRemoveHandler {
DataNodeRequestType.REMOVE_REGION_PEER);
LOGGER.info(
"{}, Send action removeRegionPeer finished, regionId: {}, rpcDataNode: {}",
- REMOVE_DATANODE_PROCESS,
+ REGION_MIGRATE_PROCESS,
regionId,
getIdWithRpcEndpoint(rpcClientDataNode));
return status;
@@ -340,7 +341,7 @@ public class DataNodeRemoveHandler {
DataNodeRequestType.DELETE_OLD_REGION_PEER);
LOGGER.info(
"{}, Send action deleteOldRegionPeer finished, regionId: {}, dataNodeId: {}",
- REMOVE_DATANODE_PROCESS,
+ REGION_MIGRATE_PROCESS,
regionId,
originalDataNode.getInternalEndPoint());
return status;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/statemachine/RegionMigrateProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/statemachine/RegionMigrateProcedure.java
index a9bfe61fa4..46b58399ca 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/statemachine/RegionMigrateProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/statemachine/RegionMigrateProcedure.java
@@ -40,7 +40,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
-import static org.apache.iotdb.confignode.conf.ConfigNodeConstant.REMOVE_DATANODE_PROCESS;
+import static org.apache.iotdb.confignode.conf.ConfigNodeConstant.REGION_MIGRATE_PROCESS;
import static org.apache.iotdb.confignode.procedure.env.DataNodeRemoveHandler.getIdWithRpcEndpoint;
import static org.apache.iotdb.rpc.TSStatusCode.SUCCESS_STATUS;
@@ -133,7 +133,7 @@ public class RegionMigrateProcedure
"{}, Meets error in region migrate state, "
+ "please do the rollback operation yourself manually according to the error message!!! "
+ "error state: {}, migrateResult: {}",
- REMOVE_DATANODE_PROCESS,
+ REGION_MIGRATE_PROCESS,
state,
migrateResult);
if (isRollbackSupported(state)) {
@@ -141,7 +141,7 @@ public class RegionMigrateProcedure
} else {
LOG.error(
"{}, Failed state [{}] is not support rollback, originalDataNode: {}",
- REMOVE_DATANODE_PROCESS,
+ REGION_MIGRATE_PROCESS,
state,
getIdWithRpcEndpoint(originalDataNode));
if (getCycles() > RETRY_THRESHOLD) {
@@ -252,7 +252,7 @@ public class RegionMigrateProcedure
LOG.info(
"{}, Wait for state {} finished, regionId: {}",
- REMOVE_DATANODE_PROCESS,
+ REGION_MIGRATE_PROCESS,
state,
consensusGroupId);
@@ -267,8 +267,7 @@ public class RegionMigrateProcedure
String.format("Region migration failed, regionId: %s", consensusGroupId));
}
} catch (InterruptedException e) {
- LOG.error(
- "{}, region migration {} interrupt", REMOVE_DATANODE_PROCESS, consensusGroupId, e);
+ LOG.error("{}, region migration {} interrupt", REGION_MIGRATE_PROCESS, consensusGroupId, e);
Thread.currentThread().interrupt();
status.setCode(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
status.setMessage("Waiting for region migration interruption," + e.getMessage());
@@ -282,7 +281,7 @@ public class RegionMigrateProcedure
LOG.info(
"{}, ConfigNode received region migration result reported by DataNode: {}",
- REMOVE_DATANODE_PROCESS,
+ REGION_MIGRATE_PROCESS,
req);
// TODO the req is used in roll back
@@ -292,7 +291,7 @@ public class RegionMigrateProcedure
if (migrateStatus.getCode() != SUCCESS_STATUS.getStatusCode()) {
LOG.info(
"{}, Region migration failed in DataNode, migrateStatus: {}",
- REMOVE_DATANODE_PROCESS,
+ REGION_MIGRATE_PROCESS,
migrateStatus);
migrateSuccess = false;
migrateResult = migrateStatus.toString();