Skip to content

branch-3.0: [fix](hdfs) remove cached file handle when read fails #54926 #54991

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
dataroaring merged 1 commit into from
Aug 20, 2025
Merged

branch-3.0: [fix](hdfs) remove cached file handle when read fails #54926 #54991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions be/src/io/fs/hdfs_file_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,18 @@ Status HdfsFileReader::close() {
return Status::OK();
}

#ifdef USE_HADOOP_HDFS
Status HdfsFileReader::read_at_impl(size_t offset, Slice result, size_t* bytes_read,
const IOContext* /*io_ctx*/) {
const IOContext* io_ctx) {
auto st = do_read_at_impl(offset, result, bytes_read, io_ctx);
if (!st.ok()) {
_accessor.destroy();
}
return st;
}

#ifdef USE_HADOOP_HDFS
Status HdfsFileReader::do_read_at_impl(size_t offset, Slice result, size_t* bytes_read,
const IOContext* /*io_ctx*/) {
if (closed()) [[unlikely]] {
return Status::InternalError("read closed file: {}", _path.native());
}
Expand Down Expand Up @@ -169,8 +178,8 @@ Status HdfsFileReader::read_at_impl(size_t offset, Slice result, size_t* bytes_r
#else
// The hedged read only support hdfsPread().
// TODO: rethink here to see if there are some difference between hdfsPread() and hdfsRead()
Status HdfsFileReader::read_at_impl(size_t offset, Slice result, size_t* bytes_read,
const IOContext* /*io_ctx*/) {
Status HdfsFileReader::do_read_at_impl(size_t offset, Slice result, size_t* bytes_read,
const IOContext* /*io_ctx*/) {
if (closed()) [[unlikely]] {
return Status::InternalError("read closed file: ", _path.native());
}
Expand Down
3 changes: 3 additions & 0 deletions be/src/io/fs/hdfs_file_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ class HdfsFileReader final : public FileReader {

void _collect_profile_before_close() override;

Status do_read_at_impl(size_t offset, Slice result, size_t* bytes_read,
const IOContext* io_ctx);

private:
#ifdef USE_HADOOP_HDFS
struct HDFSProfile {
Expand Down
Loading