[region migration] Handle InterruptedException during waitTaskFinish() more properly apache#14305

Author: liyuheng55555

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/RegionMaintainHandler.java

@@ -336,27 +336,26 @@ public TRegionMigrateResult waitTaskFinish(long taskId, TDataNodeLocation dataNo
               MAX_DISCONNECTION_TOLERATE_MS);
       long disconnectionTime = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - lastReportTime);
       if (disconnectionTime > waitTime) {
-        break;
+        LOGGER.warn(
+            "{} task {} cannot get task report from DataNode {}, last report time is {} ago",
+            REGION_MIGRATE_PROCESS,
+            taskId,
+            dataNodeLocation,
+            CommonDateTimeUtils.convertMillisecondToDurationStr(
+                TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - lastReportTime)));
+        TRegionMigrateResult report = new TRegionMigrateResult();
+        report.setTaskStatus(TRegionMaintainTaskStatus.FAIL);
+        report.setFailedNodeAndReason(new HashMap<>());
+        report.getFailedNodeAndReason().put(dataNodeLocation, TRegionMigrateFailedType.Disconnect);
+        return report;
       }
       try {
         TimeUnit.SECONDS.sleep(1);
       } catch (InterruptedException ignore) {
         Thread.currentThread().interrupt();
-        break;
+        return new TRegionMigrateResult(TRegionMaintainTaskStatus.PROCESSING);
       }
     }
-    LOGGER.warn(
-        "{} task {} cannot get task report from DataNode {}, last report time is {} ago",
-        REGION_MIGRATE_PROCESS,
-        taskId,
-        dataNodeLocation,
-        CommonDateTimeUtils.convertMillisecondToDurationStr(
-            TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - lastReportTime)));
-    TRegionMigrateResult report = new TRegionMigrateResult();
-    report.setTaskStatus(TRegionMaintainTaskStatus.FAIL);
-    report.setFailedNodeAndReason(new HashMap<>());
-    report.getFailedNodeAndReason().put(dataNodeLocation, TRegionMigrateFailedType.Disconnect);
-    return report;
   }
 
   public void addRegionLocation(TConsensusGroupId regionId, TDataNodeLocation newLocation) {

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java

@@ -123,8 +123,9 @@ protected Flow executeFromState(ConfigNodeProcedureEnv env, AddRegionPeerState s
               return warnAndRollBackAndNoMoreState(
                   env, handler, String.format("%s result is %s", state, result.getTaskStatus()));
             case PROCESSING:
-              // should never happen
-              return warnAndRollBackAndNoMoreState(env, handler, "should never return PROCESSING");
+              LOGGER.info(
+                  "waitTaskFinish() returns PROCESSING, which means the waiting has been interrupted, this procedure will end without rollback");
+              return Flow.NO_MORE_STATE;
             case SUCCESS:
               setNextState(UPDATE_REGION_LOCATION_CACHE);
               break outerSwitch;