Skip to content

branch-3.1: [fix](errmsg) recover errmsg for -230 #54697 #54731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morrySnow merged 1 commit into from
Aug 14, 2025
Merged

branch-3.1: [fix](errmsg) recover errmsg for -230 #54697 #54731

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions be/src/olap/rowset_version_mgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
Expand All @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
Loading