From 82d5735b98bf3fdbed7b19de4d831dea33c4c729 Mon Sep 17 00:00:00 2001 From: Tsunaou <895254752@qq.com> Date: Tue, 23 Jan 2024 09:42:51 +0000 Subject: [PATCH] fix bug of inc indegree of dag but parent push back failed --- deps/oblib/src/lib/utility/ob_tracepoint.h | 1 + src/share/scheduler/ob_tenant_dag_scheduler.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deps/oblib/src/lib/utility/ob_tracepoint.h b/deps/oblib/src/lib/utility/ob_tracepoint.h index fce4686394..af5e5f57f2 100644 --- a/deps/oblib/src/lib/utility/ob_tracepoint.h +++ b/deps/oblib/src/lib/utility/ob_tracepoint.h @@ -703,6 +703,7 @@ class EventTable EN_COMPACTION_UPDATE_REPORT_SCN = 737, EN_CO_MREGE_DAG_READY_FOREVER = 738, EN_CO_MREGE_DAG_SCHEDULE_REST = 739, + EN_COMPACTION_SCHEDULE_MEDIUM_MERGE_AFTER_MINI = 740, // please add new trace point after 750 EN_SESSION_LEAK_COUNT_THRESHOLD = 751, diff --git a/src/share/scheduler/ob_tenant_dag_scheduler.cpp b/src/share/scheduler/ob_tenant_dag_scheduler.cpp index 8596282c5d..38015a512a 100644 --- a/src/share/scheduler/ob_tenant_dag_scheduler.cpp +++ b/src/share/scheduler/ob_tenant_dag_scheduler.cpp @@ -131,9 +131,10 @@ int ObINodeWithChild::add_parent_node(ObINodeWithChild &parent) { int ret = OB_SUCCESS; ObMutexGuard guard(lock_); - inc_indegree(); if (OB_FAIL(parent_.push_back(&parent))) { COMMON_LOG(WARN, "failed to add parent", K(ret), K(parent)); + } else { + inc_indegree(); } return ret; }