From b0a890d60eb88e1ab85882f4e26a7c4aeffe5739 Mon Sep 17 00:00:00 2001
From: zhaoyiping0622 <zhaoyiping0622@gmail.com>
Date: Mon, 8 Jul 2024 14:47:33 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=87=E7=BA=A7=E8=84=9A?=
 =?UTF-8?q?=E6=9C=ACjob=5Fname=20is=20not=20defined?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/upgrade/upgrade_health_checker.py | 4 ++--
 tools/upgrade/upgrade_post.py           | 4 ++--
 tools/upgrade/upgrade_pre.py            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/upgrade/upgrade_health_checker.py b/tools/upgrade/upgrade_health_checker.py
index d6555d4ec..51835fc37 100755
--- a/tools/upgrade/upgrade_health_checker.py
+++ b/tools/upgrade/upgrade_health_checker.py
@@ -386,8 +386,8 @@ def check_until_timeout(query_cur, sql, value, timeout):
 
     times -= 1
     if times == -1:
-      logging.warn("""check {0} job timeout""".format(job_name))
-      raise MyError("""check {0} job timeout""".format(job_name))
+      logging.warn("""result not expected, sql: '{0}', expected: '{1}', current: '{2}'""".format(sql, value, results[0][0]))
+      raise MyError("""result not expected, sql: '{0}', expected: '{1}', current: '{2}'""".format(sql, value, results[0][0]))
     time.sleep(10)
 
 # 开始健康检查
diff --git a/tools/upgrade/upgrade_post.py b/tools/upgrade/upgrade_post.py
index 3842bbc80..f086851ef 100755
--- a/tools/upgrade/upgrade_post.py
+++ b/tools/upgrade/upgrade_post.py
@@ -2859,8 +2859,8 @@
 #
 #    times -= 1
 #    if times == -1:
-#      logging.warn("""check {0} job timeout""".format(job_name))
-#      raise MyError("""check {0} job timeout""".format(job_name))
+#      logging.warn("""result not expected, sql: '{0}', expected: '{1}', current: '{2}'""".format(sql, value, results[0][0]))
+#      raise MyError("""result not expected, sql: '{0}', expected: '{1}', current: '{2}'""".format(sql, value, results[0][0]))
 #    time.sleep(10)
 #
 ## 开始健康检查
diff --git a/tools/upgrade/upgrade_pre.py b/tools/upgrade/upgrade_pre.py
index cd2362deb..170f4fa19 100755
--- a/tools/upgrade/upgrade_pre.py
+++ b/tools/upgrade/upgrade_pre.py
@@ -2859,8 +2859,8 @@
 #
 #    times -= 1
 #    if times == -1:
-#      logging.warn("""check {0} job timeout""".format(job_name))
-#      raise MyError("""check {0} job timeout""".format(job_name))
+#      logging.warn("""result not expected, sql: '{0}', expected: '{1}', current: '{2}'""".format(sql, value, results[0][0]))
+#      raise MyError("""result not expected, sql: '{0}', expected: '{1}', current: '{2}'""".format(sql, value, results[0][0]))
 #    time.sleep(10)
 #
 ## 开始健康检查