From 0f51bfba706aa02fea803575e7ba238ac2872510 Mon Sep 17 00:00:00 2001 From: luozihao <1165977584@qq.com> Date: Sat, 6 May 2023 17:08:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpg=5Fjob=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E4=B8=8D=E9=87=8D=E5=90=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/backend/catalog/pg_job.cpp | 4 ++++ src/gausskernel/process/job/job_scheduler.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/common/backend/catalog/pg_job.cpp b/src/common/backend/catalog/pg_job.cpp index 9a98ea28e0..256e436c8a 100644 --- a/src/common/backend/catalog/pg_job.cpp +++ b/src/common/backend/catalog/pg_job.cpp @@ -1929,8 +1929,12 @@ void update_run_job_to_fail() while (HeapTupleIsValid(tuple = heap_getnext(scan, ForwardScanDirection))) { Form_pg_job pg_job = (Form_pg_job)GETSTRUCT(tuple); /* Every coordinator should update all tuples which job_status is 'r'. */ +#ifdef ENABLE_MULTIPLE_NODES if (pg_job->job_status == PGJOB_RUN_STATUS && 0 == strcmp(pg_job->node_name.data, g_instance.attr.attr_common.PGXCNodeName)) { +#else + if (pg_job->job_status == PGJOB_RUN_STATUS) { +#endif get_job_values(pg_job->job_id, tuple, pg_job_tbl, old_value, visnull); values[Anum_pg_job_failure_count - 1] = Int16GetDatum(pg_job->failure_count + 1); diff --git a/src/gausskernel/process/job/job_scheduler.cpp b/src/gausskernel/process/job/job_scheduler.cpp index b823edec41..e7e6510388 100755 --- a/src/gausskernel/process/job/job_scheduler.cpp +++ b/src/gausskernel/process/job/job_scheduler.cpp @@ -734,10 +734,12 @@ static void ScanExpireJobs() continue; } +#ifdef ENABLE_MULTIPLE_NODES /* handle cases - ALL_NODE/ALL_CN/ALL_DN/CCN specific node */ if (!IsExecuteOnCurrentNode(pg_job->node_name.data)) { continue; } +#endif Datum cur_job_start_time = DirectFunctionCall1(timestamp_timestamptz, values[Anum_pg_job_next_run_date - 1]); if (false == DatumGetBool(DirectFunctionCall2(timestamp_gt, curtime, cur_job_start_time))) { -- Gitee