mirrors/dragonflydb-dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2024-12-14 11:58:02 +00:00
Code Activity

fix: Do not kill Dragonfly on failed DFLY LOAD (#3892)

Browse source 
Today, some of the failures to load an RDB file passed via
`--dbfilename` cause Dragonfly to terminate with an error code. This is
ok and works as expected.

The problem is that the same code path is used for `DFLY LOAD`, which
means that if there's an error loading the file (such as corrupted
file), Dragonfly will exit instead of returning an error code to the
client.

This change fixes that, by only exiting in the code path which loads on
init.

Note to reviewer: apparently we can't call `Future::Get()` more than
once, as the first call resets the state of the future and drops the
previously saved value, so we use a Fiber here instead.
This commit is contained in:
Shahar Mike 2024-10-08 14:47:31 +03:00 committed by GitHub
parent b2ebfd05d4
commit 50a7f2bcb1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/server/server_family.cc
View file

@ -916,7 +916,15 @@ void ServerFamily::LoadFromSnapshot() {
if (load_path_result) {
const std::string load_path = *load_path_result;
if (!load_path.empty()) {
load_result_ = Load(load_path, LoadExistingKeys::kFail);
auto future = Load(load_path, LoadExistingKeys::kFail);
load_fiber_ = service_.proactor_pool().GetNextProactor()->LaunchFiber([future]() mutable {
// Wait for load to finish in a dedicated fiber.
// Failure to load on start causes Dragonfly to exit with an error code.
if (!future.has_value() || future->Get()) {
// Error was already printed to log at this point.
exit(1);
}
});
}
} else {
if (std::error_code(load_path_result.error()) == std::errc::no_such_file_or_directory) {
@ -938,9 +946,7 @@ void ServerFamily::JoinSnapshotSchedule() {
void ServerFamily::Shutdown() {
VLOG(1) << "ServerFamily::Shutdown";
if (load_result_) {
std::exchange(load_result_, std::nullopt)->Get();
}
load_fiber_.JoinIfNeeded();
JoinSnapshotSchedule();
@ -1121,7 +1127,9 @@ std::optional<fb2::Future<GenericError>> ServerFamily::Load(string_view load_pat
if (aggregated_result->first_error) {
LOG(ERROR) << "Rdb load failed. " << (*aggregated_result->first_error).message();
exit(1);
service_.SwitchState(GlobalState::LOADING, GlobalState::ACTIVE);
future.Resolve(*aggregated_result->first_error);
return;
}
RdbLoader::PerformPostLoad(&service_);

2
src/server/server_family.h
View file

@ -331,7 +331,7 @@ class ServerFamily {
bool DoAuth(ConnectionContext* cntx, std::string_view username, std::string_view password) const;
util::fb2::Fiber snapshot_schedule_fb_;
std::optional<util::fb2::Future<GenericError>> load_result_;
util::fb2::Fiber load_fiber_;
Service& service_;