From 37ea9ea95a13650755f3e8e43e9fe9628eedf91c Mon Sep 17 00:00:00 2001 From: Yongqiang YANG Date: Wed, 13 Aug 2025 19:53:03 +0800 Subject: [PATCH 1/2] [fix](errmsg) recover errmsg for -230 It is intruduced by https://github.com/apache/doris/pull/40716 while it is dismissed by https://github.com/apache/doris/pull/52440. --- be/src/olap/rowset_version_mgr.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/be/src/olap/rowset_version_mgr.cpp b/be/src/olap/rowset_version_mgr.cpp index 731287dcb0049b..f64ca67d1b3222 100644 --- a/be/src/olap/rowset_version_mgr.cpp +++ b/be/src/olap/rowset_version_mgr.cpp @@ -73,7 +73,7 @@ static bvar::LatencyRecorder g_remote_fetch_tablet_rowsets_latency("remote_fetch "version already has been merged. version_range={}, max_version={}, " "tablet_id={}", version_range.to_string(), _tablet_meta->max_version().second, tablet_id()); - return ResultError(Status::Error( + return ResultError(Status::Error( "missed versions is empty, version_range={}, max_version={}, tablet_id={}", version_range.to_string(), _tablet_meta->max_version().second, tablet_id())); } @@ -92,7 +92,9 @@ static bvar::LatencyRecorder g_remote_fetch_tablet_rowsets_latency("remote_fetch return version_path; } if ((tablet_id != -1 && tablet_id == _tablet_meta->tablet_id()) || tablet_id == -2) { - return ResultError(Status::Error("version already merged")); + return ResultError(Status::Error( + "versions are already compacted, version_range={}, max_version={}, tablet_id={}", + version_range.to_string(), _tablet_meta->max_version().second, tablet_id)); } }); return version_path; @@ -150,8 +152,8 @@ static bvar::LatencyRecorder g_remote_fetch_tablet_rowsets_latency("remote_fetch } auto ret = _remote_capture_rowsets(version_range); if (!ret) { - auto st = Status::Error( - "version already merged, meet error during remote capturing rowsets, " + auto st = Status::Error( + "versions are already compacted, meet error during remote capturing rowsets, " "error={}, version_range={}", ret.error().to_string(), version_range.to_string()); return ResultError(std::move(st)); From b08adfece93928e81ddff5e25fedf8f17e6bc5a5 Mon Sep 17 00:00:00 2001 From: Yongqiang YANG Date: Wed, 13 Aug 2025 19:56:27 +0800 Subject: [PATCH 2/2] fix --- be/src/olap/rowset_version_mgr.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/be/src/olap/rowset_version_mgr.cpp b/be/src/olap/rowset_version_mgr.cpp index f64ca67d1b3222..d222ccfbb02b60 100644 --- a/be/src/olap/rowset_version_mgr.cpp +++ b/be/src/olap/rowset_version_mgr.cpp @@ -93,7 +93,8 @@ static bvar::LatencyRecorder g_remote_fetch_tablet_rowsets_latency("remote_fetch } if ((tablet_id != -1 && tablet_id == _tablet_meta->tablet_id()) || tablet_id == -2) { return ResultError(Status::Error( - "versions are already compacted, version_range={}, max_version={}, tablet_id={}", + "versions are already compacted, version_range={}, max_version={}, " + "tablet_id={}", version_range.to_string(), _tablet_meta->max_version().second, tablet_id)); } });