This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new e1b8296d3b9 branch-3.0: [Fix](checker) Fixed infinite loop after
internal error in checker. #44479 (#44495)
e1b8296d3b9 is described below
commit e1b8296d3b90a360adbe08f23402b76b520edaf0
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Nov 23 10:47:37 2024 +0800
branch-3.0: [Fix](checker) Fixed infinite loop after internal error in
checker. #44479 (#44495)
Cherry-picked from #44479
Co-authored-by: abmdocrt <lianyuk...@selectdb.com>
---
cloud/src/recycler/checker.cpp | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/cloud/src/recycler/checker.cpp b/cloud/src/recycler/checker.cpp
index fe0887867b0..19a10d61c12 100644
--- a/cloud/src/recycler/checker.cpp
+++ b/cloud/src/recycler/checker.cpp
@@ -168,25 +168,17 @@ int Checker::start() {
auto ctime_ms =
duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
g_bvar_checker_enqueue_cost_s.put(instance_id, ctime_ms / 1000 -
enqueue_time_s);
- ret = checker->do_check();
+ int ret1 = checker->do_check();
+ int ret2 = 0;
if (config::enable_inverted_check) {
- if (ret == 0) {
- ret = checker->do_inverted_check();
- }
- }
-
- if (ret < 0) {
- // If ret < 0, it means that a temporary error occurred during
the check process.
- // The check job should not be considered finished, and the
next round of check job
- // should be retried as soon as possible.
- return;
+ ret2 = checker->do_inverted_check();
}
// If instance checker has been aborted, don't finish this job
if (!checker->stopped()) {
finish_instance_recycle_job(txn_kv_.get(), check_job_key,
instance.instance_id(),
- ip_port_, ret == 0, ctime_ms);
+ ip_port_, ret1 == 0 && ret2 == 0,
ctime_ms);
}
{
std::lock_guard lock(mtx_);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
