Skip to content

[fix](load) handle Status in beta rowset writer #25293

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 3 commits into from
Oct 12, 2023
Merged

[fix](load) handle Status in beta rowset writer #25293

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af4cb18
[fix](load) handle Status in beta rowset writer
kaijchen Oct 11, 2023
6410589
fixup
kaijchen Oct 12, 2023
f8affcc
Merge branch 'master' into handle-status
kaijchen Oct 12, 2023
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
19 changes: 12 additions & 7 deletions be/src/olap/rowset/beta_rowset_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,12 @@ BetaRowsetWriter::~BetaRowsetWriter() {
* when the job is cancelled. Although it is meaningless to continue segcompaction when the job
* is cancelled, the objects involved in the job should be preserved during segcompaction to
* avoid crashs for memory issues. */
static_cast<void>(wait_flying_segcompaction());
WARN_IF_ERROR(wait_flying_segcompaction(), "segment compaction failed");

// TODO(lingbin): Should wrapper exception logic, no need to know file ops directly.
if (!_already_built) { // abnormal exit, remove all files generated
static_cast<void>(_segment_creator.close()); // ensure all files are closed
if (!_already_built) { // abnormal exit, remove all files generated
WARN_IF_ERROR(_segment_creator.close(),
"close segment creator failed"); // ensure all files are closed
auto fs = _rowset_meta->fs();
if (fs->type() != io::FileSystemType::LOCAL) { // Remote fs will delete them asynchronously
return;
Expand Down Expand Up @@ -123,7 +124,7 @@ Status BetaRowsetWriter::init(const RowsetWriterContext& rowset_writer_context)
std::make_shared<vectorized::schema_util::LocalSchemaChangeRecorder>();
_context.segment_collector = std::make_shared<SegmentCollectorT<BetaRowsetWriter>>(this);
_context.file_writer_creator = std::make_shared<FileWriterCreatorT<BetaRowsetWriter>>(this);
static_cast<void>(_segment_creator.init(_context));
RETURN_IF_ERROR(_segment_creator.init(_context));
return Status::OK();
}

Expand Down Expand Up @@ -413,7 +414,7 @@ Status BetaRowsetWriter::add_rowset(RowsetSharedPtr rowset) {
_total_index_size += rowset->rowset_meta()->index_disk_size();
_num_segment += rowset->num_segments();
// append key_bounds to current rowset
static_cast<void>(rowset->get_segments_key_bounds(&_segments_encoded_key_bounds));
RETURN_IF_ERROR(rowset->get_segments_key_bounds(&_segments_encoded_key_bounds));
// TODO update zonemap
if (rowset->rowset_meta()->has_delete_predicate()) {
_rowset_meta->set_delete_predicate(rowset->rowset_meta()->delete_predicate());
Expand Down Expand Up @@ -515,7 +516,11 @@ RowsetSharedPtr BetaRowsetWriter::build() {
}

if (_segcompaction_worker.get_file_writer()) {
static_cast<void>(_segcompaction_worker.get_file_writer()->close());
status = _segcompaction_worker.get_file_writer()->close();
if (!status.ok()) {
LOG(WARNING) << "close segment compaction worker failed" << status;
return nullptr;
}
}
}
status = _check_segment_number_limit();
Expand Down Expand Up @@ -679,7 +684,7 @@ Status BetaRowsetWriter::_create_segment_writer_for_segcompaction(
_context.data_dir, _context.max_rows_per_segment,
writer_options, _context.mow_context));
if (_segcompaction_worker.get_file_writer() != nullptr) {
static_cast<void>(_segcompaction_worker.get_file_writer()->close());
RETURN_IF_ERROR(_segcompaction_worker.get_file_writer()->close());
}
_segcompaction_worker.get_file_writer().reset(file_writer.release());

Expand Down