Skip to content

[improve](stack) do not report stack for -230 #40716

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
gavinchou merged 4 commits into from
Sep 18, 2024
Merged

[improve](stack) do not report stack for -230 #40716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a85954
[improve](stack) do not report stack for -230
dataroaring Sep 12, 2024
e06aacf
format
dataroaring Sep 12, 2024
ae412d5
fix
dataroaring Sep 12, 2024
4f0ed5d
fix
dataroaring Sep 12, 2024
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
1 change: 1 addition & 0 deletions be/src/cloud/cloud_tablet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ Status CloudTablet::capture_rs_readers(const Version& spec_version,
auto missed_versions = get_missed_versions(spec_version.second);
if (missed_versions.empty()) {
st.set_code(VERSION_ALREADY_MERGED); // Reset error code
st.append(" versions are already compacted, ");
}
st.append(" tablet_id=" + std::to_string(tablet_id()));
// clang-format off
Expand Down
4 changes: 2 additions & 2 deletions be/src/olap/tablet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,8 +855,8 @@ Status Tablet::capture_consistent_versions_unlocked(const Version& spec_version,
<< ", version already has been merged. spec_version: " << spec_version
<< ", max_version: " << max_version_unlocked();
}
status = Status::Error<VERSION_ALREADY_MERGED>(
"missed_versions is empty, spec_version "
status = Status::Error<VERSION_ALREADY_MERGED, false>(
"versions are already compacted, spec_version "
"{}, max_version {}, tablet_id {}",
spec_version.second, max_version_unlocked(), tablet_id());
} else {
Expand Down
15 changes: 9 additions & 6 deletions be/src/olap/version_graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,9 @@ void VersionGraph::_add_vertex_to_graph(int64_t vertex_value) {
Status VersionGraph::capture_consistent_versions(const Version& spec_version,
std::vector<Version>* version_path) const {
if (spec_version.first > spec_version.second) {
return Status::Error<INVALID_ARGUMENT>("invalid specified version. spec_version={}-{}",
spec_version.first, spec_version.second);
return Status::Error<INVALID_ARGUMENT, false>(
"invalid specified version. spec_version={}-{}", spec_version.first,
spec_version.second);
}

int64_t cur_idx = -1;
Expand All @@ -579,8 +580,9 @@ Status VersionGraph::capture_consistent_versions(const Version& spec_version,
}

if (cur_idx < 0) {
return Status::InternalError("failed to find path in version_graph. spec_version: {}-{}",
spec_version.first, spec_version.second);
return Status::InternalError<false>(
"failed to find path in version_graph. spec_version: {}-{}", spec_version.first,
spec_version.second);
}

int64_t end_value = spec_version.second + 1;
Expand Down Expand Up @@ -609,8 +611,9 @@ Status VersionGraph::capture_consistent_versions(const Version& spec_version,
}
cur_idx = next_idx;
} else {
return Status::InternalError("fail to find path in version_graph. spec_version: {}-{}",
spec_version.first, spec_version.second);
return Status::InternalError<false>(
"fail to find path in version_graph. spec_version: {}-{}", spec_version.first,
spec_version.second);
}
}

Expand Down