Skip to content
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

[fix](index compaction) fix fd leak and mem leak while index compaction #41915

Merged
merged 1 commit into from
Oct 21, 2024
Merged

[fix](index compaction) fix fd leak and mem leak while index compaction #41915

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
7 changes: 3 additions & 4 deletions be/src/olap/compaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,19 +746,18 @@ Status Compaction::do_inverted_index_compaction() {
}

std::vector<lucene::store::Directory*> dest_index_dirs(dest_segment_num);
std::vector<lucene::store::Directory*> src_index_dirs(src_segment_num);
try {
std::vector<std::unique_ptr<DorisCompoundReader>> src_idx_dirs(src_segment_num);
for (int src_segment_id = 0; src_segment_id < src_segment_num; src_segment_id++) {
auto src_dir =
src_idx_dirs[src_segment_id] =
DORIS_TRY(inverted_index_file_readers[src_segment_id]->open(index_meta));
src_index_dirs[src_segment_id] = src_dir.release();
}
for (int dest_segment_id = 0; dest_segment_id < dest_segment_num; dest_segment_id++) {
auto* dest_dir =
DORIS_TRY(inverted_index_file_writers[dest_segment_id]->open(index_meta));
dest_index_dirs[dest_segment_id] = dest_dir;
}
auto st = compact_column(index_meta->index_id(), src_index_dirs, dest_index_dirs,
auto st = compact_column(index_meta->index_id(), src_idx_dirs, dest_index_dirs,
index_tmp_path.native(), trans_vec, dest_segment_num_rows);
if (!st.ok()) {
error_handler(index_meta->index_id(), column_uniq_id);
Expand Down
15 changes: 7 additions & 8 deletions be/src/olap/rowset/segment_v2/inverted_index_compaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
#include "util/debug_points.h"

namespace doris::segment_v2 {
Status compact_column(int64_t index_id, std::vector<lucene::store::Directory*>& src_index_dirs,
Status compact_column(int64_t index_id,
std::vector<std::unique_ptr<DorisCompoundReader>>& src_index_dirs,
std::vector<lucene::store::Directory*>& dest_index_dirs,
std::string_view tmp_path,
const std::vector<std::vector<std::pair<uint32_t, uint32_t>>>& trans_vec,
Expand All @@ -48,7 +49,11 @@ Status compact_column(int64_t index_id, std::vector<lucene::store::Directory*>&
true /* closeDirOnShutdown */);

DCHECK_EQ(src_index_dirs.size(), trans_vec.size());
index_writer->indexCompaction(src_index_dirs, dest_index_dirs, trans_vec,
std::vector<lucene::store::Directory*> tmp_src_index_dirs(src_index_dirs.size());
for (size_t i = 0; i < tmp_src_index_dirs.size(); ++i) {
tmp_src_index_dirs[i] = src_index_dirs[i].get();
}
index_writer->indexCompaction(tmp_src_index_dirs, dest_index_dirs, trans_vec,
dest_segment_num_rows);

index_writer->close();
Expand All @@ -57,12 +62,6 @@ Status compact_column(int64_t index_id, std::vector<lucene::store::Directory*>&
// when index_writer is destroyed, if closeDir is set, dir will be close
// _CLDECDELETE(dir) will try to ref_cnt--, when it decreases to 1, dir will be destroyed.
_CLDECDELETE(dir)
for (auto* d : src_index_dirs) {
if (d != nullptr) {
d->close();
_CLDELETE(d);
}
}
for (auto* d : dest_index_dirs) {
if (d != nullptr) {
// NOTE: DO NOT close dest dir here, because it will be closed when dest index writer finalize.
Expand Down
4 changes: 3 additions & 1 deletion be/src/olap/rowset/segment_v2/inverted_index_compaction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@
#include <vector>

#include "common/status.h"
#include "inverted_index_compound_reader.h"

namespace doris {
class TabletIndex;
namespace segment_v2 {
class InvertedIndexFileWriter;
class InvertedIndexFileReader;

Status compact_column(int64_t index_id, std::vector<lucene::store::Directory*>& src_index_dirs,
Status compact_column(int64_t index_id,
std::vector<std::unique_ptr<DorisCompoundReader>>& src_index_dirs,
std::vector<lucene::store::Directory*>& dest_index_dirs,
std::string_view tmp_path,
const std::vector<std::vector<std::pair<uint32_t, uint32_t>>>& trans_vec,
Expand Down
Loading