From c079ad80b523e2336a1d140059e015766df4dad3 Mon Sep 17 00:00:00 2001
From: mystarry-sky <zilan1986@163.com>
Date: Wed, 19 Feb 2025 17:33:47 +0800
Subject: [PATCH] =?UTF-8?q?Portal=E7=9B=91=E6=8E=A7=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=80=80=E5=87=BA=E5=90=8E=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E7=9B=91=E5=90=AC=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B=E4=BB=8E=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E3=80=82=E4=BF=AE=E5=A4=8Dconnect-source?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=83=B5=E5=B0=B8=E8=BF=9B=E7=A8=8B=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/opengauss/portalcontroller/task/Plan.java    | 5 ++++-
 .../portalcontroller/task/RunningTaskThread.java          | 8 +-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/opengauss/portalcontroller/task/Plan.java b/src/main/java/org/opengauss/portalcontroller/task/Plan.java
index bb6cf23..4daf683 100644
--- a/src/main/java/org/opengauss/portalcontroller/task/Plan.java
+++ b/src/main/java/org/opengauss/portalcontroller/task/Plan.java
@@ -68,6 +68,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -680,7 +681,7 @@ public final class Plan {
             handleKafkaError();
             return false;
         }
-
+        List<RunningTaskThread> missThreadList = new LinkedList<>();
         for (RunningTaskThread thread : runningTaskThreadsList) {
             int pid = ProcessUtils.getCommandPid(thread.getProcessName());
             if (pid == -1) {
@@ -692,6 +693,7 @@ public final class Plan {
                     ProcessUtils.sleepThread(1000, "plan_paused");
                     break;
                 } else {
+                    missThreadList.add(thread);
                     Task.getCheckProcessMap().get(thread.getName()).checkStatus();
                     if (!Method.Name.CONNECT_TYPE_LIST.contains(thread.getName())) {
                         Plan.stopPlan = true;
@@ -700,6 +702,7 @@ public final class Plan {
                 }
             }
         }
+        runningTaskThreadsList.removeAll(missThreadList);
         return isAlive;
     }
 
diff --git a/src/main/java/org/opengauss/portalcontroller/task/RunningTaskThread.java b/src/main/java/org/opengauss/portalcontroller/task/RunningTaskThread.java
index 63eead9..1411cff 100644
--- a/src/main/java/org/opengauss/portalcontroller/task/RunningTaskThread.java
+++ b/src/main/java/org/opengauss/portalcontroller/task/RunningTaskThread.java
@@ -18,7 +18,6 @@ package org.opengauss.portalcontroller.task;
 import org.opengauss.portalcontroller.PortalControl;
 import org.opengauss.portalcontroller.alert.ErrorCode;
 import org.opengauss.portalcontroller.constant.Parameter;
-import org.opengauss.portalcontroller.constant.Status;
 import org.opengauss.portalcontroller.exception.PortalException;
 import org.opengauss.portalcontroller.utils.ProcessUtils;
 import org.opengauss.portalcontroller.utils.RuntimeExecUtils;
@@ -188,12 +187,7 @@ public class RunningTaskThread {
         try {
             String errorPath = PortalControl.toolsConfigParametersTable.get(Parameter.ERROR_PATH);
             if (order.equals("")) {
-                String killOrder;
-                if (PortalControl.status >= Status.RUNNING_INCREMENTAL_MIGRATION && methodName.contains("Check")) {
-                    killOrder = "kill -9 " + pid;
-                } else {
-                    killOrder = "kill -15 " + pid;
-                }
+                String killOrder = "kill -9 " + pid;
                 RuntimeExecUtils.executeOrder(killOrder, 3000, errorPath);
             } else {
                 killProcessByOrder(order, errorPath);
-- 
Gitee