mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-12 19:05:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

cleanup

Browse source
This commit is contained in:
kostas 2025-05-06 18:15:30 +03:00
parent 7ff2a81aa3
commit 9e77a8516a
No known key found for this signature in database
GPG key ID: 1860AC7B1177CACB
4 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/server/detail/save_stages_controller.cc
View file

@ -164,10 +164,9 @@ void RdbSnapshot::StartInShard(EngineShard* shard) {
started_shards_.fetch_add(1, memory_order_relaxed); started_shards_.fetch_add(1, memory_order_relaxed);
} }
SaveStagesController::SaveStagesController(SaveStagesInputs&& inputs, bool is_bg_save) SaveStagesController::SaveStagesController(SaveStagesInputs&& inputs)
: SaveStagesInputs{std::move(inputs)} { : SaveStagesInputs{std::move(inputs)} {
start_time_ = time(NULL); start_time_ = time(NULL);
is_bg_save_ = is_bg_save;
} }
SaveStagesController::~SaveStagesController() { SaveStagesController::~SaveStagesController() {

4
src/server/detail/save_stages_controller.h
View file

@ -35,6 +35,8 @@ struct SaveStagesInputs {
Service* service_; Service* service_;
util::fb2::FiberQueueThreadPool* fq_threadpool_; util::fb2::FiberQueueThreadPool* fq_threadpool_;
std::shared_ptr<SnapshotStorage> snapshot_storage_; std::shared_ptr<SnapshotStorage> snapshot_storage_;
// true if the command that triggered this flow is bgsave. false otherwise.
bool is_bg_save_;
}; };
class RdbSnapshot { class RdbSnapshot {
@ -77,7 +79,7 @@ class RdbSnapshot {
}; };
struct SaveStagesController : public SaveStagesInputs { struct SaveStagesController : public SaveStagesInputs {
SaveStagesController(SaveStagesInputs&& input, bool is_bg_save = false); explicit SaveStagesController(SaveStagesInputs&& input);
// Objects of this class are used concurrently. Call this function // Objects of this class are used concurrently. Call this function
// in a mutually exlusive context to avoid data races. // in a mutually exlusive context to avoid data races.
// Also call this function before any call to `WaitAllSnapshots` // Also call this function before any call to `WaitAllSnapshots`

18
src/server/server_family.cc
View file

@ -1707,8 +1707,8 @@ GenericError ServerFamily::DoSave(bool ignore_state) {
} }
GenericError ServerFamily::DoSaveCheckAndStart(const SaveCmdOptions& save_cmd_opts, GenericError ServerFamily::DoSaveCheckAndStart(const SaveCmdOptions& save_cmd_opts,
Transaction* trans, bool ignore_state, Transaction* trans, DoSaveCheckAndStartOpts opts) {
bool bg_save) { auto [ignore_state, bg_save] = opts;
auto state = ServerState::tlocal()->gstate(); auto state = ServerState::tlocal()->gstate();
// In some cases we want to create a snapshot even if server is not active, f.e in takeover // In some cases we want to create a snapshot even if server is not active, f.e in takeover
@ -1727,11 +1727,9 @@ GenericError ServerFamily::DoSaveCheckAndStart(const SaveCmdOptions& save_cmd_op
? snapshot_storage_ ? snapshot_storage_
: CreateCloudSnapshotStorage(save_cmd_opts.cloud_uri); : CreateCloudSnapshotStorage(save_cmd_opts.cloud_uri);
save_controller_ = make_unique<SaveStagesController>( save_controller_ = make_unique<SaveStagesController>(detail::SaveStagesInputs{
detail::SaveStagesInputs{save_cmd_opts.new_version, save_cmd_opts.cloud_uri, save_cmd_opts.new_version, save_cmd_opts.cloud_uri, save_cmd_opts.basename, trans,
save_cmd_opts.basename, trans, &service_, fq_threadpool_.get(), &service_, fq_threadpool_.get(), snapshot_storage, opts.bg_save});
snapshot_storage},
true);
auto res = save_controller_->InitResourcesAndStart(); auto res = save_controller_->InitResourcesAndStart();
@ -1780,7 +1778,8 @@ GenericError ServerFamily::WaitUntilSaveFinished(Transaction* trans, bool ignore
GenericError ServerFamily::DoSave(const SaveCmdOptions& save_cmd_opts, Transaction* trans, GenericError ServerFamily::DoSave(const SaveCmdOptions& save_cmd_opts, Transaction* trans,
bool ignore_state) { bool ignore_state) {
if (auto ec = DoSaveCheckAndStart(save_cmd_opts, trans, ignore_state); ec) { DoSaveCheckAndStartOpts opts{.ignore_state = ignore_state};
if (auto ec = DoSaveCheckAndStart(save_cmd_opts, trans, opts); ec) {
return ec; return ec;
} }
@ -2195,7 +2194,8 @@ void ServerFamily::BgSave(CmdArgList args, const CommandContext& cmd_cntx) {
return; return;
} }
if (auto ec = DoSaveCheckAndStart(*maybe_res, cmd_cntx.tx, false, true); ec) { DoSaveCheckAndStartOpts opts{.bg_save = true};
if (auto ec = DoSaveCheckAndStart(*maybe_res, cmd_cntx.tx, opts); ec) {
cmd_cntx.rb->SendError(ec.Format()); cmd_cntx.rb->SendError(ec.Format());
return; return;
} }

8
src/server/server_family.h
View file

@ -343,9 +343,13 @@ class ServerFamily {
void BgSaveFb(boost::intrusive_ptr<Transaction> trans); void BgSaveFb(boost::intrusive_ptr<Transaction> trans);
struct DoSaveCheckAndStartOpts {
bool ignore_state = false;
bool bg_save = false;
};
GenericError DoSaveCheckAndStart(const SaveCmdOptions& save_cmd_opts, Transaction* trans, GenericError DoSaveCheckAndStart(const SaveCmdOptions& save_cmd_opts, Transaction* trans,
bool ignore_state = false, bool bg_save = false) DoSaveCheckAndStartOpts opts) ABSL_LOCKS_EXCLUDED(save_mu_);
ABSL_LOCKS_EXCLUDED(save_mu_);
GenericError WaitUntilSaveFinished(Transaction* trans, GenericError WaitUntilSaveFinished(Transaction* trans,
bool ignore_state = false) ABSL_NO_THREAD_SAFETY_ANALYSIS; bool ignore_state = false) ABSL_NO_THREAD_SAFETY_ANALYSIS;