You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by da...@apache.org on 2023/11/27 09:44:08 UTC
(doris) branch branch-2.0 updated: [enhance](S3) Print the error detail for every s3 operation (#27572) (#27615)
This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 c5c6926e15a [enhance](S3) Print the error detail for every s3 operation (#27572) (#27615)
c5c6926e15a is described below
commit c5c6926e15a74c47e77987dd8f21ea89b1aa466a
Author: AlexYue <yj...@gmail.com>
AuthorDate: Mon Nov 27 17:43:57 2023 +0800
[enhance](S3) Print the error detail for every s3 operation (#27572) (#27615)
---
be/src/io/fs/buffered_reader.cpp | 4 ++++
be/src/io/fs/s3_file_reader.cpp | 6 ++++--
be/src/io/fs/s3_file_system.cpp | 7 ++++---
be/src/io/fs/s3_file_writer.cpp | 38 +++++++++++++++++++++++++-------------
4 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/be/src/io/fs/buffered_reader.cpp b/be/src/io/fs/buffered_reader.cpp
index fdcba04190f..18e638d6d75 100644
--- a/be/src/io/fs/buffered_reader.cpp
+++ b/be/src/io/fs/buffered_reader.cpp
@@ -476,6 +476,10 @@ void PrefetchBuffer::prefetch_buffer() {
return;
}
if (!s.ok() && _offset < _reader->size()) {
+ // We should print the error msg since this buffer might not be accessed by the consumer
+ // which would result in the status being missed
+ LOG_WARNING("prefetch path {} failed, offset {}, error {}", _reader->path().native(),
+ _offset, s.to_string());
_prefetch_status = std::move(s);
}
_buffer_status = BufferStatus::PREFETCHED;
diff --git a/be/src/io/fs/s3_file_reader.cpp b/be/src/io/fs/s3_file_reader.cpp
index 2403b2497ed..ceebc683a94 100644
--- a/be/src/io/fs/s3_file_reader.cpp
+++ b/be/src/io/fs/s3_file_reader.cpp
@@ -96,8 +96,10 @@ Status S3FileReader::read_at_impl(size_t offset, Slice result, size_t* bytes_rea
}
auto outcome = client->GetObject(request);
if (!outcome.IsSuccess()) {
- return Status::IOError("failed to read from {}: {}", _path.native(),
- outcome.GetError().GetMessage());
+ return Status::IOError("failed to read from {}: {}, exception {}, error code {}",
+ _path.native(), outcome.GetError().GetMessage(),
+ outcome.GetError().GetExceptionName(),
+ outcome.GetError().GetResponseCode());
}
*bytes_read = outcome.GetResult().GetContentLength();
if (*bytes_read != bytes_req) {
diff --git a/be/src/io/fs/s3_file_system.cpp b/be/src/io/fs/s3_file_system.cpp
index 79f2a324f44..a00a5efc9a9 100644
--- a/be/src/io/fs/s3_file_system.cpp
+++ b/be/src/io/fs/s3_file_system.cpp
@@ -527,9 +527,10 @@ Status S3FileSystem::get_key(const Path& path, std::string* key) const {
template <typename AwsOutcome>
std::string S3FileSystem::error_msg(const std::string& key, const AwsOutcome& outcome) const {
- return fmt::format("(endpoint: {}, bucket: {}, key:{}, {}), {}", _s3_conf.endpoint,
- _s3_conf.bucket, key, outcome.GetError().GetExceptionName(),
- outcome.GetError().GetMessage());
+ return fmt::format("(endpoint: {}, bucket: {}, key:{}, {}), {}, error code {}",
+ _s3_conf.endpoint, _s3_conf.bucket, key,
+ outcome.GetError().GetExceptionName(), outcome.GetError().GetMessage(),
+ outcome.GetError().GetResponseCode());
}
std::string S3FileSystem::error_msg(const std::string& key, const std::string& err) const {
diff --git a/be/src/io/fs/s3_file_writer.cpp b/be/src/io/fs/s3_file_writer.cpp
index 6bbd076d16a..4a937f52057 100644
--- a/be/src/io/fs/s3_file_writer.cpp
+++ b/be/src/io/fs/s3_file_writer.cpp
@@ -117,8 +117,11 @@ Status S3FileWriter::_create_multi_upload_request() {
_upload_id = outcome.GetResult().GetUploadId();
return Status::OK();
}
- return Status::IOError("failed to create multipart upload(bucket={}, key={}, upload_id={}): {}",
- _bucket, _path.native(), _upload_id, outcome.GetError().GetMessage());
+ return Status::IOError(
+ "failed to create multipart upload(bucket={}, key={}, upload_id={}): {}, exception {}, "
+ "error code {}",
+ _bucket, _path.native(), _upload_id, outcome.GetError().GetMessage(),
+ outcome.GetError().GetExceptionName(), outcome.GetError().GetResponseCode());
}
void S3FileWriter::_wait_until_finish(std::string_view task_name) {
@@ -168,8 +171,11 @@ Status S3FileWriter::abort() {
_aborted = true;
return Status::OK();
}
- return Status::IOError("failed to abort multipart upload(bucket={}, key={}, upload_id={}): {}",
- _bucket, _path.native(), _upload_id, outcome.GetError().GetMessage());
+ return Status::IOError(
+ "failed to abort multipart upload(bucket={}, key={}, upload_id={}): {}, exception {}, "
+ "error code {}",
+ _bucket, _path.native(), _upload_id, outcome.GetError().GetMessage(),
+ outcome.GetError().GetExceptionName(), outcome.GetError().GetResponseCode());
}
Status S3FileWriter::close() {
@@ -277,9 +283,12 @@ void S3FileWriter::_upload_one_part(int64_t part_num, S3FileBuffer& buf) {
UploadPartOutcome upload_part_outcome = upload_part_callable.get();
if (!upload_part_outcome.IsSuccess()) {
auto s = Status::IOError(
- "failed to upload part (bucket={}, key={}, part_num={}, up_load_id={}): {}",
+ "failed to upload part (bucket={}, key={}, part_num={}, up_load_id={}): {}, "
+ "exception {}, error code {}",
_bucket, _path.native(), part_num, _upload_id,
- upload_part_outcome.GetError().GetMessage());
+ upload_part_outcome.GetError().GetMessage(),
+ upload_part_outcome.GetError().GetExceptionName(),
+ upload_part_outcome.GetError().GetResponseCode());
LOG_WARNING(s.to_string());
buf._on_failed(s);
return;
@@ -326,8 +335,11 @@ Status S3FileWriter::_complete() {
if (!compute_outcome.IsSuccess()) {
auto s = Status::IOError(
- "failed to create complete multi part upload (bucket={}, key={}): {}", _bucket,
- _path.native(), compute_outcome.GetError().GetMessage());
+ "failed to create complete multi part upload (bucket={}, key={}): {}, exception "
+ "{}, error code {}",
+ _bucket, _path.native(), compute_outcome.GetError().GetMessage(),
+ compute_outcome.GetError().GetExceptionName(),
+ compute_outcome.GetError().GetResponseCode());
LOG_WARNING(s.to_string());
return s;
}
@@ -365,12 +377,12 @@ void S3FileWriter::_put_object(S3FileBuffer& buf) {
request.SetContentType("application/octet-stream");
auto response = _client->PutObject(request);
if (!response.IsSuccess()) {
- _st = Status::InternalError("Error: [{}:{}, responseCode:{}]",
- response.GetError().GetExceptionName(),
- response.GetError().GetMessage(),
- static_cast<int>(response.GetError().GetResponseCode()));
- buf._on_failed(_st);
+ _st = Status::InternalError(
+ "failed to put object (bucket={}, key={}), Error: [{}:{}, responseCode:{}]",
+ _bucket, _path.native(), response.GetError().GetExceptionName(),
+ response.GetError().GetMessage(), response.GetError().GetResponseCode());
LOG(WARNING) << _st;
+ buf._on_failed(_st);
return;
}
_bytes_written += buf.get_size();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org