mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 18:35:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix(server): Better error reporting when opening snapshot files (#1112)

Browse source
This commit is contained in:
Roy Jacobson 2023-04-19 15:34:59 +03:00 • committed by GitHub
parent 1319918476
commit dd97b36965
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/server/server_family.cc
View file

@ -190,7 +190,7 @@ class RdbSnapshot {
RdbSnapshot(FiberQueueThreadPool* fq_tp) : fq_tp_(fq_tp) {
}
error_code Start(SaveMode save_mode, const string& path, const StringVec& lua_scripts);
GenericError Start(SaveMode save_mode, const string& path, const StringVec& lua_scripts);
void StartInShard(EngineShard* shard);
error_code SaveBody();
@ -223,18 +223,20 @@ io::Result<size_t> LinuxWriteWrapper::WriteSome(const iovec* v, uint32_t len) {
return res;
}
error_code RdbSnapshot::Start(SaveMode save_mode, const std::string& path,
const StringVec& lua_scripts) {
GenericError RdbSnapshot::Start(SaveMode save_mode, const std::string& path,
const StringVec& lua_scripts) {
bool is_direct = false;
if (fq_tp_) { // EPOLL
auto res = util::OpenFiberWriteFile(path, fq_tp_);
if (!res)
return res.error();
return GenericError(res.error(), "Couldn't open file for writing");
io_sink_.reset(*res);
} else {
auto res = OpenLinux(path, kRdbWriteFlags, 0666);
if (!res) {
return res.error();
return GenericError(
res.error(),
"Couldn't open file for writing (is direct I/O supported by the file system?)");
}
io_sink_.reset(new LinuxWriteWrapper(res->release()));
is_direct = kRdbWriteFlags & O_DIRECT;
@ -899,8 +901,8 @@ using PartialSaveOpts = tuple<const fs::path& /*filename*/, const fs::path& /*pa
// Start saving a single snapshot of a multi-file dfly snapshot.
// If shard is null, then this is the summary file.
error_code DoPartialSave(PartialSaveOpts opts, const dfly::StringVec& scripts,
RdbSnapshot* snapshot, EngineShard* shard) {
GenericError DoPartialSave(PartialSaveOpts opts, const dfly::StringVec& scripts,
RdbSnapshot* snapshot, EngineShard* shard) {
auto [filename, path] = opts;
// Construct resulting filename.
fs::path full_filename = filename;
@ -913,7 +915,7 @@ error_code DoPartialSave(PartialSaveOpts opts, const dfly::StringVec& scripts,
// Start rdb saving.
SaveMode mode = shard == nullptr ? SaveMode::SUMMARY : SaveMode::SINGLE_SHARD;
error_code local_ec = snapshot->Start(mode, full_path.generic_string(), scripts);
GenericError local_ec = snapshot->Start(mode, full_path.generic_string(), scripts);
if (!local_ec && mode == SaveMode::SINGLE_SHARD) {
snapshot->StartInShard(shard);