mirror of
https://github.com/facebook/rocksdb.git
synced 2024-11-30 04:41:49 +00:00
63da9cfa26
Summary: Currently, we incorrectly return a Status::Corruption to the MultiGet caller if the file system ReadAsync cannot issue a read and returns an error for some reason, such as IOStatus::NotSupported(). In this PR, we copy the ReadAsync error to the request status so it can be returned to the user. Tests: Update existing unit tests and add a new one for this scenario Pull Request resolved: https://github.com/facebook/rocksdb/pull/11171 Reviewed By: akankshamahajan15 Differential Revision: D42950057 Pulled By: anand1976 fbshipit-source-id: 85ffcb015fa6c064c311f8a28488fec78c487869
82 lines
2.5 KiB
C++
82 lines
2.5 KiB
C++
// Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
//
|
|
// This source code is licensed under both the GPLv2 (found in the
|
|
// COPYING file in the root directory) and Apache 2.0 License
|
|
// (found in the LICENSE.Apache file in the root directory).
|
|
//
|
|
#if USE_COROUTINES
|
|
#include "util/async_file_reader.h"
|
|
|
|
namespace ROCKSDB_NAMESPACE {
|
|
bool AsyncFileReader::MultiReadAsyncImpl(ReadAwaiter* awaiter) {
|
|
if (tail_) {
|
|
tail_->next_ = awaiter;
|
|
}
|
|
tail_ = awaiter;
|
|
if (!head_) {
|
|
head_ = awaiter;
|
|
}
|
|
num_reqs_ += awaiter->num_reqs_;
|
|
awaiter->io_handle_.resize(awaiter->num_reqs_);
|
|
awaiter->del_fn_.resize(awaiter->num_reqs_);
|
|
for (size_t i = 0; i < awaiter->num_reqs_; ++i) {
|
|
IOStatus s = awaiter->file_->ReadAsync(
|
|
awaiter->read_reqs_[i], awaiter->opts_,
|
|
[](const FSReadRequest& req, void* cb_arg) {
|
|
FSReadRequest* read_req = static_cast<FSReadRequest*>(cb_arg);
|
|
read_req->status = req.status;
|
|
read_req->result = req.result;
|
|
},
|
|
&awaiter->read_reqs_[i], &awaiter->io_handle_[i], &awaiter->del_fn_[i],
|
|
/*aligned_buf=*/nullptr);
|
|
if (!s.ok()) {
|
|
// For any non-ok status, the FileSystem will not call the callback
|
|
// So let's update the status ourselves
|
|
awaiter->read_reqs_[i].status = s;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void AsyncFileReader::Wait() {
|
|
if (!head_) {
|
|
return;
|
|
}
|
|
ReadAwaiter* waiter;
|
|
std::vector<void*> io_handles;
|
|
IOStatus s;
|
|
io_handles.reserve(num_reqs_);
|
|
waiter = head_;
|
|
do {
|
|
for (size_t i = 0; i < waiter->num_reqs_; ++i) {
|
|
if (waiter->io_handle_[i]) {
|
|
io_handles.push_back(waiter->io_handle_[i]);
|
|
}
|
|
}
|
|
} while (waiter != tail_ && (waiter = waiter->next_));
|
|
if (io_handles.size() > 0) {
|
|
StopWatch sw(SystemClock::Default().get(), stats_, POLL_WAIT_MICROS);
|
|
s = fs_->Poll(io_handles, io_handles.size());
|
|
}
|
|
do {
|
|
waiter = head_;
|
|
head_ = waiter->next_;
|
|
|
|
for (size_t i = 0; i < waiter->num_reqs_; ++i) {
|
|
if (waiter->io_handle_[i] && waiter->del_fn_[i]) {
|
|
waiter->del_fn_[i](waiter->io_handle_[i]);
|
|
}
|
|
if (waiter->read_reqs_[i].status.ok() && !s.ok()) {
|
|
// Override the request status with the Poll error
|
|
waiter->read_reqs_[i].status = s;
|
|
}
|
|
}
|
|
waiter->awaiting_coro_.resume();
|
|
} while (waiter != tail_);
|
|
head_ = tail_ = nullptr;
|
|
RecordInHistogram(stats_, MULTIGET_IO_BATCH_SIZE, num_reqs_);
|
|
num_reqs_ = 0;
|
|
}
|
|
} // namespace ROCKSDB_NAMESPACE
|
|
#endif // USE_COROUTINES
|