This is an automated email from the ASF dual-hosted git repository.
gavinchou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 538817ad6ab [improve](stack) do not report stack for -230 (#40716)
538817ad6ab is described below
commit 538817ad6abe52fdb3252e4ad01ce328da4ce72e
Author: Yongqiang YANG <[email protected]>
AuthorDate: Wed Sep 18 23:53:17 2024 +0800
[improve](stack) do not report stack for -230 (#40716)
---
be/src/cloud/cloud_tablet.cpp | 1 +
be/src/olap/tablet.cpp | 4 ++--
be/src/olap/version_graph.cpp | 15 +++++++++------
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/be/src/cloud/cloud_tablet.cpp b/be/src/cloud/cloud_tablet.cpp
index 8d132020a77..a7e482a7eb7 100644
--- a/be/src/cloud/cloud_tablet.cpp
+++ b/be/src/cloud/cloud_tablet.cpp
@@ -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
diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
index e3ac43c734a..b23404583f7 100644
--- a/be/src/olap/tablet.cpp
+++ b/be/src/olap/tablet.cpp
@@ -856,8 +856,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 {
diff --git a/be/src/olap/version_graph.cpp b/be/src/olap/version_graph.cpp
index abdf82d8953..010e7ce9fd8 100644
--- a/be/src/olap/version_graph.cpp
+++ b/be/src/olap/version_graph.cpp
@@ -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;
@@ -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;
@@ -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);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
