[iotdb] branch master updated: [IOTDB-4050] Failed to wait region migrate finished (#6908)

[caogaofei]

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 742cc64c85 [IOTDB-4050] Failed to wait region migrate finished (#6908)
742cc64c85 is described below

commit 742cc64c85ff332afd2b14d9d968ce395960e32d
Author: wangchao316 <66939405+wangchao...@users.noreply.github.com>
AuthorDate: Mon Aug 8 15:12:47 2022 +0800

    [IOTDB-4050] Failed to wait region migrate finished (#6908)
---
 .../iotdb/confignode/procedure/impl/RegionMigrateProcedure.java      | 5 +----
 .../iotdb/confignode/procedure/state/RegionTransitionState.java      | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/RegionMigrateProcedure.java
 
b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/RegionMigrateProcedure.java
index b16967dc75..8958e9c9f8 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/RegionMigrateProcedure.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/RegionMigrateProcedure.java
@@ -87,12 +87,9 @@ public class RegionMigrateProcedure
         case MIGRATE_REGION:
           env.getDataNodeRemoveHandler()
               .migrateRegion(originalDataNode, destDataNode, consensusGroupId);
-          setNextState(RegionTransitionState.WAIT_FOR_REGION_MIGRATE_FINISHED);
-          break;
-        case WAIT_FOR_REGION_MIGRATE_FINISHED:
           waitForTheRegionMigrateFinished(consensusGroupId);
-          setNextState(RegionTransitionState.UPDATE_REGION_LOCATION_CACHE);
           LOG.info("Wait for region {}  migrate finished", consensusGroupId);
+          setNextState(RegionTransitionState.UPDATE_REGION_LOCATION_CACHE);
           break;
         case UPDATE_REGION_LOCATION_CACHE:
           env.getDataNodeRemoveHandler()
diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/state/RegionTransitionState.java
 
b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/state/RegionTransitionState.java
index 0c83cd2411..236a334dd9 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/state/RegionTransitionState.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/state/RegionTransitionState.java
@@ -23,6 +23,5 @@ public enum RegionTransitionState {
   REGION_MIGRATE_PREPARE,
   ADD_NEW_NODE_TO_REGION_CONSENSUS_GROUP,
   MIGRATE_REGION,
-  WAIT_FOR_REGION_MIGRATE_FINISHED,
   UPDATE_REGION_LOCATION_CACHE
 }