This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 74f73be87a5 [enhancement](230) print max version and spec version when
-230 happens (#26643) (#26854)
74f73be87a5 is described below
commit 74f73be87a599d3b7c8ed923fc1b0ec88fb96ec9
Author: Yongqiang YANG <[email protected]>
AuthorDate: Mon Nov 13 11:52:51 2023 +0800
[enhancement](230) print max version and spec version when -230 happens
(#26643) (#26854)
---
be/src/olap/tablet.cpp | 10 +++++++---
be/src/vec/exec/scan/new_olap_scanner.cpp | 4 +---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
index 7c9a6ecfaa6..22276e4041e 100644
--- a/be/src/olap/tablet.cpp
+++ b/be/src/olap/tablet.cpp
@@ -857,10 +857,14 @@ Status Tablet::capture_consistent_versions(const Version&
spec_version,
// if version_path is null, it may be a compaction check logic.
// so to avoid print too many logs.
if (version_path != nullptr) {
- LOG(WARNING) << "tablet:" << full_name()
- << ", version already has been merged.
spec_version: " << spec_version;
+ LOG(WARNING) << "tablet:" << tablet_id()
+ << ", version already has been merged.
spec_version: " << spec_version
+ << ", max_version: " << max_version_unlocked();
}
- status = Status::Error<VERSION_ALREADY_MERGED>("missed_versions is
empty");
+ status = Status::Error<VERSION_ALREADY_MERGED>(
+ "missed_versions is empty, spec_version "
+ "{}, max_version {}, tablet_id {}",
+ spec_version.second, max_version_unlocked().second,
tablet_id());
} else {
if (version_path != nullptr) {
LOG(WARNING) << "status:" << status << ", tablet:" <<
full_name()
diff --git a/be/src/vec/exec/scan/new_olap_scanner.cpp
b/be/src/vec/exec/scan/new_olap_scanner.cpp
index 03c14ddafe0..42913697fcf 100644
--- a/be/src/vec/exec/scan/new_olap_scanner.cpp
+++ b/be/src/vec/exec/scan/new_olap_scanner.cpp
@@ -189,9 +189,7 @@ Status NewOlapScanner::init() {
auto st = _tablet->capture_rs_readers(rd_version,
&read_source.rs_splits);
if (!st.ok()) {
LOG(WARNING) << "fail to init reader.res=" << st;
- return Status::InternalError(
- "failed to initialize storage reader. tablet_id={}
: {}",
- _tablet->tablet_id(), st.to_string());
+ return st;
}
}
if (!_state->skip_delete_predicate()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
