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.

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(bulkload): bulkload cause many node coredump #2077

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 31 additions & 23 deletions src/replica/bulk_load/replica_bulk_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@
// under the License.

#include <fmt/core.h>
#include <algorithm>
#include <functional>
#include <memory>
#include <string_view>
#include <unordered_map>
#include <utility>
#include <vector>

#include <string_view>
#include "block_service/block_service_manager.h"
#include "common/bulk_load_common.h"
#include "common/gpid.h"
Expand Down Expand Up @@ -519,22 +520,32 @@ void replica_bulk_loader::download_files(const std::string &provider_name,
}

// download sst files asynchronously
if (!_metadata.files.empty()) {
const file_meta &f_meta = _metadata.files[0];
_download_files_task[f_meta.name] = tasking::enqueue(
LPC_BACKGROUND_BULK_LOAD,
tracker(),
std::bind(&replica_bulk_loader::download_sst_file, this, remote_dir, local_dir, 0, fs));
{
zauto_read_lock l(_lock);
if (!_metadata.files.empty()) {
_download_files_task[_metadata.files.back().name] = tasking::enqueue(
LPC_BACKGROUND_BULK_LOAD,
tracker(),
[this, remote_dir, local_dir, file_meta = _metadata.files, fs]() mutable {
this->download_sst_file(remote_dir, local_dir, std::move(file_meta), fs);
});
}
}
}

// ThreadPool: THREAD_POOL_DEFAULT
void replica_bulk_loader::download_sst_file(const std::string &remote_dir,
const std::string &local_dir,
int32_t file_index,
dist::block_service::block_filesystem *fs)
void replica_bulk_loader::download_sst_file(
const std::string &remote_dir,
const std::string &local_dir,
std::vector<::dsn::replication::file_meta> &&download_file_metas,
dist::block_service::block_filesystem *fs)
{
const file_meta &f_meta = _metadata.files[file_index];
if (_status != bulk_load_status::BLS_DOWNLOADING) {
LOG_WARNING_PREFIX("Cancel download_sst_file task, because bulk_load local_status is {}.",
enum_to_string(_status));
return;
}
const file_meta &f_meta = download_file_metas.back();
uint64_t f_size = 0;
std::string f_md5;
error_code ec = _stub->_block_service_manager.download_file(
Expand Down Expand Up @@ -585,22 +596,19 @@ void replica_bulk_loader::download_sst_file(const std::string &remote_dir,
return;
}
// download file succeed, update progress
download_file_metas.pop_back();
update_bulk_load_download_progress(f_size, f_meta.name);
METRIC_VAR_INCREMENT(bulk_load_download_file_successful_count);
METRIC_VAR_INCREMENT_BY(bulk_load_download_file_bytes, f_size);

// download next file
if (file_index + 1 < _metadata.files.size()) {
const file_meta &next_f_meta = _metadata.files[file_index + 1];
_download_files_task[next_f_meta.name] =
tasking::enqueue(LPC_BACKGROUND_BULK_LOAD,
tracker(),
std::bind(&replica_bulk_loader::download_sst_file,
this,
remote_dir,
local_dir,
file_index + 1,
fs));
if (!download_file_metas.empty()) {
_download_files_task[download_file_metas.back().name] = tasking::enqueue(
LPC_BACKGROUND_BULK_LOAD,
tracker(),
[this, remote_dir, local_dir, download_file_metas, fs]() mutable {
this->download_sst_file(remote_dir, local_dir, std::move(download_file_metas), fs);
});
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/replica/bulk_load/replica_bulk_loader.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <map>
#include <ostream>
#include <string>
#include <vector>

#include "bulk_load_types.h"
#include "common/replication_other_types.h"
Expand Down Expand Up @@ -89,7 +90,7 @@ class replica_bulk_loader : replica_base
// download sst files from remote provider
void download_sst_file(const std::string &remote_dir,
const std::string &local_dir,
int32_t file_index,
std::vector<::dsn::replication::file_meta> &&download_file_metas,
dist::block_service::block_filesystem *fs);

// \return ERR_PATH_NOT_FOUND: file not exist
Expand Down
Loading