This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 058769d7ca1 branch-3.1: [fix](errmsg) recover errmsg for -230 #54697
(#54731)
058769d7ca1 is described below
commit 058769d7ca17e12077d9f54e30d5b791616c8644
Author: Yongqiang YANG <yangyongqi...@selectdb.com>
AuthorDate: Thu Aug 14 17:37:59 2025 +0800
branch-3.1: [fix](errmsg) recover errmsg for -230 #54697 (#54731)
pick #54697
---
be/src/olap/rowset_version_mgr.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/be/src/olap/rowset_version_mgr.cpp
b/be/src/olap/rowset_version_mgr.cpp
index 731287dcb00..d222ccfbb02 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<VERSION_ALREADY_MERGED>(
+ return ResultError(Status::Error<VERSION_ALREADY_MERGED, false>(
"missed versions is empty, version_range={},
max_version={}, tablet_id={}",
version_range.to_string(),
_tablet_meta->max_version().second, tablet_id()));
}
@@ -92,7 +92,10 @@ 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>("version
already merged"));
+ return ResultError(Status::Error<VERSION_ALREADY_MERGED, false>(
+ "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 +153,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>(
- "version already merged, meet error during remote capturing
rowsets, "
+ auto st = Status::Error<VERSION_ALREADY_MERGED, false>(
+ "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));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
