From 116f38403b146dbf474556a0a6b0ff768dee930b Mon Sep 17 00:00:00 2001
From: duanguoqiang <duanguoqiang4@huawei.com>
Date: Mon, 10 Mar 2025 19:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=A0portal=E5=92=8Cdatak?=
 =?UTF-8?q?it=E6=97=B6=E5=8C=BA=E4=B8=8D=E7=BB=9F=E4=B8=80=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=BC=95=E8=B5=B7=E7=9A=84=E5=81=9C=E6=AD=A2=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E6=97=A0=E6=B3=95=E5=81=9C=E6=AD=A2=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/plugin/handler/MigrationRecoveryHandler.java    | 7 +++++--
 .../org/opengauss/admin/plugin/handler/PortalHandle.java  | 8 ++++++--
 .../plugin/service/impl/MigrationMainTaskServiceImpl.java | 4 ++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/handler/MigrationRecoveryHandler.java b/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/handler/MigrationRecoveryHandler.java
index 13c870ead..9f49684b0 100644
--- a/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/handler/MigrationRecoveryHandler.java
+++ b/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/handler/MigrationRecoveryHandler.java
@@ -387,7 +387,8 @@ class MigrationCommand {
     private static final String REVERSE_MIGRATION_RUN = "run_reverse_migration";
     private static final String REVERSE_MIGRATION_SOURCE = "run_reverse_migration_source";
     private static final String REVERSE_MIGRATION_SINK = "run_reverse_migration_sink";
-    private static final String CMD_PORTAL_TEMP = "java -Dpath=%s -Dorder=%s -Dskip=true -Dworkspace.id=%s -jar %s";
+    private static final String CMD_PORTAL_TEMP = "java -Dpath=%s -Dorder=%s -Dorder.invoked.timestamp=%s"
+            + " -Dskip=true -Dworkspace.id=%s -jar %s";
     private static final Map<String, String> MIGRATION_PROPERTIES = new HashMap<>();
 
     static {
@@ -447,6 +448,8 @@ class MigrationCommand {
     public String builder(String name) {
         OpsAssert.isTrue(MIGRATION_PROPERTIES.containsKey(name), "unknown migration command");
         String order = MIGRATION_PROPERTIES.get(name);
-        return String.format(CMD_PORTAL_TEMP, installPath, order, workspaceId, installPath + jarName);
+        long orderInvokedTimestamp = System.currentTimeMillis();
+        return String.format(CMD_PORTAL_TEMP, installPath, order, orderInvokedTimestamp,
+                workspaceId, installPath + jarName);
     }
 }
diff --git a/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/handler/PortalHandle.java b/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/handler/PortalHandle.java
index 348dd7816..f40bb7680 100644
--- a/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/handler/PortalHandle.java
+++ b/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/handler/PortalHandle.java
@@ -318,12 +318,16 @@ public class PortalHandle {
 
     public static void stopIncrementalPortal(String host, Integer port, String user, String pass, String installPath, String portalJarName, MigrationTask task) {
         String portalHome = installPath + "portal/";
-        ShellUtil.execCommand(host, port, user, pass, "java -Dpath=" + portalHome + " -Dworkspace.id=" + task.getId() + " -Dorder=stop_incremental_migration -Dskip=true -jar " + portalHome + portalJarName);
+        ShellUtil.execCommand(host, port, user, pass, "java -Dpath=" + portalHome
+                + " -Dworkspace.id=" + task.getId() + " -Dorder.invoked.timestamp=" + task.getOrderInvokedTimestamp()
+                + " -Dorder=stop_incremental_migration -Dskip=true -jar " + portalHome + portalJarName);
     }
 
     public static void startReversePortal(String host, Integer port, String user, String pass, String installPath, String portalJarName, MigrationTask task) {
         String portalHome = installPath + "portal/";
-        ShellUtil.execCommand(host, port, user, pass, "java -Dpath=" + portalHome + " -Dworkspace.id=" + task.getId() + " -Dorder=run_reverse_migration -Dskip=true -jar " + portalHome + portalJarName);
+        ShellUtil.execCommand(host, port, user, pass, "java -Dpath=" + portalHome
+                + " -Dworkspace.id=" + task.getId() + " -Dorder.invoked.timestamp=" + task.getOrderInvokedTimestamp()
+                + " -Dorder=run_reverse_migration -Dskip=true -jar " + portalHome + portalJarName);
     }
 
     public static String getPortalStatus(String host, Integer port, String user, String pass, String installPath, MigrationTask task) {
diff --git a/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationMainTaskServiceImpl.java b/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationMainTaskServiceImpl.java
index 727971071..42c7b1708 100644
--- a/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationMainTaskServiceImpl.java
+++ b/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationMainTaskServiceImpl.java
@@ -531,6 +531,8 @@ public class MigrationMainTaskServiceImpl extends ServiceImpl<MigrationMainTaskM
             return AjaxResult.error(MigrationErrorCode.SUB_TASK_NOT_IN_INCREMENTAL_ERROR.getCode(), MigrationErrorCode.SUB_TASK_NOT_IN_INCREMENTAL_ERROR.getMsg());
         }
         MigrationHostPortalInstall installHost = migrationHostPortalInstallHostService.getOneByHostId(subTask.getRunHostId());
+        long stopIncrementalTimestamp = System.currentTimeMillis();
+        subTask.setOrderInvokedTimestamp(stopIncrementalTimestamp);
         PortalHandle.stopIncrementalPortal(subTask.getRunHost(), subTask.getRunPort(),
                 subTask.getRunUser(), encryptionUtils.decrypt(subTask.getRunPass()), installHost.getInstallPath(), installHost.getJarName(), subTask);
         MigrationTask update = MigrationTask.builder().id(subTask.getId()).execStatus(TaskStatus.INCREMENTAL_FINISHED.getCode()).execTime(new Date()).build();
@@ -616,6 +618,8 @@ public class MigrationMainTaskServiceImpl extends ServiceImpl<MigrationMainTaskM
         if (!migrationTaskService.execMigrationCheck(installHost, subTask, globalParams, "verify_reverse_migration")) {
             return AjaxResult.success();
         }
+        long startReverseTimestamp = System.currentTimeMillis();
+        subTask.setOrderInvokedTimestamp(startReverseTimestamp);
         PortalHandle.startReversePortal(subTask.getRunHost(), subTask.getRunPort(), subTask.getRunUser(),
             encryptionUtils.decrypt(subTask.getRunPass()), installHost.getInstallPath(), installHost.getJarName(),
             subTask);
-- 
Gitee