mirror of
https://github.com/trapexit/mergerfs.git
synced 2026-11-21 23:46:26 -05:00
Add "per-process" file caching feature
Allows chosing page caching based on process name.
This commit is contained in:
parent
b51a5970b2
commit
9effeb6869
15 changed files with 363 additions and 55 deletions
|
|
@ -37,11 +37,13 @@
|
|||
|
||||
#define MINFREESPACE_DEFAULT (4294967295ULL)
|
||||
|
||||
using std::string;
|
||||
|
||||
#define IFERT(S) if(S == s_) return true
|
||||
|
||||
const std::string CONTROLFILE = "/.mergerfs";
|
||||
constexpr static const char CACHE_FILES_PROCESS_NAMES_DEFAULT[] =
|
||||
"rtorrent|"
|
||||
"qbittorrent-nox";
|
||||
|
||||
|
||||
Config Config::_singleton;
|
||||
|
||||
|
|
@ -79,6 +81,7 @@ Config::Config()
|
|||
cache_attr(1),
|
||||
cache_entry(1),
|
||||
cache_files(CacheFiles::ENUM::LIBFUSE),
|
||||
cache_files_process_names(CACHE_FILES_PROCESS_NAMES_DEFAULT),
|
||||
cache_negative_entry(0),
|
||||
cache_readdir(false),
|
||||
cache_statfs(0),
|
||||
|
|
@ -125,6 +128,7 @@ Config::Config()
|
|||
_map["cache.attr"] = &cache_attr;
|
||||
_map["cache.entry"] = &cache_entry;
|
||||
_map["cache.files"] = &cache_files;
|
||||
_map["cache.files.process-names"] = &cache_files_process_names;
|
||||
_map["cache.negative_entry"] = &cache_negative_entry;
|
||||
_map["cache.readdir"] = &cache_readdir;
|
||||
_map["cache.statfs"] = &cache_statfs;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
#include "config_statfs.hpp"
|
||||
#include "config_statfsignore.hpp"
|
||||
#include "config_xattr.hpp"
|
||||
#include "config_set.hpp"
|
||||
#include "enum.hpp"
|
||||
#include "errno.hpp"
|
||||
#include "funcs.hpp"
|
||||
|
|
@ -107,6 +108,7 @@ public:
|
|||
ConfigUINT64 cache_attr;
|
||||
ConfigUINT64 cache_entry;
|
||||
CacheFiles cache_files;
|
||||
ConfigSet cache_files_process_names;
|
||||
ConfigUINT64 cache_negative_entry;
|
||||
ConfigBOOL cache_readdir;
|
||||
ConfigUINT64 cache_statfs;
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@ CacheFiles::to_string() const
|
|||
return "full";
|
||||
case CacheFiles::ENUM::AUTO_FULL:
|
||||
return "auto-full";
|
||||
case CacheFiles::ENUM::PER_PROCESS:
|
||||
return "per-process";
|
||||
}
|
||||
|
||||
return "invalid";
|
||||
|
|
@ -55,6 +57,8 @@ CacheFiles::from_string(const std::string &s_)
|
|||
_data = CacheFiles::ENUM::FULL;
|
||||
ef(s_ == "auto-full")
|
||||
_data = CacheFiles::ENUM::AUTO_FULL;
|
||||
ef(s_ == "per-process")
|
||||
_data = CacheFiles::ENUM::PER_PROCESS;
|
||||
else
|
||||
return -EINVAL;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,8 @@ enum class CacheFilesEnum
|
|||
OFF,
|
||||
PARTIAL,
|
||||
FULL,
|
||||
AUTO_FULL
|
||||
AUTO_FULL,
|
||||
PER_PROCESS
|
||||
};
|
||||
|
||||
typedef Enum<CacheFilesEnum> CacheFiles;
|
||||
|
|
|
|||
43
src/config_set.cpp
Normal file
43
src/config_set.cpp
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
/*
|
||||
ISC License
|
||||
|
||||
Copyright (c) 2023, Antonio SJ Musumeci <trapexit@spawn.link>
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted, provided that the above
|
||||
copyright notice and this permission notice appear in all copies.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "config_set.hpp"
|
||||
|
||||
#include "str.hpp"
|
||||
|
||||
|
||||
ConfigSet::ConfigSet(const std::string &str_)
|
||||
{
|
||||
from_string(str_);
|
||||
}
|
||||
|
||||
std::string
|
||||
ConfigSet::to_string(void) const
|
||||
{
|
||||
return str::join(*this,'|');
|
||||
}
|
||||
|
||||
int
|
||||
ConfigSet::from_string(const std::string &str_)
|
||||
{
|
||||
this->clear();
|
||||
|
||||
str::split(str_,'|',this);
|
||||
|
||||
return 0;
|
||||
}
|
||||
35
src/config_set.hpp
Normal file
35
src/config_set.hpp
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
/*
|
||||
ISC License
|
||||
|
||||
Copyright (c) 2023, Antonio SJ Musumeci <trapexit@spawn.link>
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted, provided that the above
|
||||
copyright notice and this permission notice appear in all copies.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "tofrom_string.hpp"
|
||||
|
||||
#include <set>
|
||||
#include <string>
|
||||
|
||||
|
||||
class ConfigSet : public std::set<std::string>, public ToFromString
|
||||
{
|
||||
public:
|
||||
ConfigSet(const std::string &str);
|
||||
|
||||
public:
|
||||
std::string to_string(void) const final;
|
||||
int from_string(const std::string &) final;
|
||||
};
|
||||
41
src/fs_openat.hpp
Normal file
41
src/fs_openat.hpp
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
/*
|
||||
ISC License
|
||||
|
||||
Copyright (c) 2023, Antonio SJ Musumeci <trapexit@spawn.link>
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted, provided that the above
|
||||
copyright notice and this permission notice appear in all copies.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
|
||||
namespace fs
|
||||
{
|
||||
static
|
||||
inline
|
||||
int
|
||||
openat(const int dirfd_,
|
||||
const char *pathname_,
|
||||
const int flags_)
|
||||
{
|
||||
int rv;
|
||||
|
||||
rv = ::openat(dirfd_,pathname_,flags_);
|
||||
|
||||
return ((rv == -1) ? -errno : rv);
|
||||
}
|
||||
}
|
||||
|
|
@ -21,6 +21,7 @@
|
|||
#include "fs_clonepath.hpp"
|
||||
#include "fs_open.hpp"
|
||||
#include "fs_path.hpp"
|
||||
#include "procfs_get_name.hpp"
|
||||
#include "ugid.hpp"
|
||||
|
||||
#include "fuse.h"
|
||||
|
|
@ -28,9 +29,6 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
|
||||
namespace l
|
||||
{
|
||||
|
|
@ -56,6 +54,7 @@ namespace l
|
|||
static
|
||||
void
|
||||
config_to_ffi_flags(Config::Read &cfg_,
|
||||
const int tid_,
|
||||
fuse_file_info_t *ffi_)
|
||||
{
|
||||
switch(cfg_->cache_files)
|
||||
|
|
@ -85,15 +84,32 @@ namespace l
|
|||
ffi_->keep_cache = 0;
|
||||
ffi_->auto_cache = 1;
|
||||
break;
|
||||
case CacheFiles::ENUM::PER_PROCESS:
|
||||
std::string proc_name;
|
||||
|
||||
proc_name = procfs::get_name(tid_);
|
||||
if(cfg_->cache_files_process_names.count(proc_name) == 0)
|
||||
{
|
||||
ffi_->direct_io = 1;
|
||||
ffi_->keep_cache = 0;
|
||||
ffi_->auto_cache = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
ffi_->direct_io = 0;
|
||||
ffi_->keep_cache = 0;
|
||||
ffi_->auto_cache = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
create_core(const string &fullpath_,
|
||||
mode_t mode_,
|
||||
const mode_t umask_,
|
||||
const int flags_)
|
||||
create_core(const std::string &fullpath_,
|
||||
mode_t mode_,
|
||||
const mode_t umask_,
|
||||
const int flags_)
|
||||
{
|
||||
if(!fs::acl::dir_has_defaults(fullpath_))
|
||||
mode_ &= ~umask_;
|
||||
|
|
@ -103,15 +119,15 @@ namespace l
|
|||
|
||||
static
|
||||
int
|
||||
create_core(const string &createpath_,
|
||||
const char *fusepath_,
|
||||
const mode_t mode_,
|
||||
const mode_t umask_,
|
||||
const int flags_,
|
||||
uint64_t *fh_)
|
||||
create_core(const std::string &createpath_,
|
||||
const char *fusepath_,
|
||||
const mode_t mode_,
|
||||
const mode_t umask_,
|
||||
const int flags_,
|
||||
uint64_t *fh_)
|
||||
{
|
||||
int rv;
|
||||
string fullpath;
|
||||
std::string fullpath;
|
||||
|
||||
fullpath = fs::path::make(createpath_,fusepath_);
|
||||
|
||||
|
|
@ -136,8 +152,8 @@ namespace l
|
|||
uint64_t *fh_)
|
||||
{
|
||||
int rv;
|
||||
string fullpath;
|
||||
string fusedirpath;
|
||||
std::string fullpath;
|
||||
std::string fusedirpath;
|
||||
StrVec createpaths;
|
||||
StrVec existingpaths;
|
||||
|
||||
|
|
@ -175,7 +191,7 @@ namespace FUSE
|
|||
const fuse_context *fc = fuse_get_context();
|
||||
const ugid::Set ugid(fc->uid,fc->gid);
|
||||
|
||||
l::config_to_ffi_flags(cfg,ffi_);
|
||||
l::config_to_ffi_flags(cfg,fc->pid,ffi_);
|
||||
|
||||
if(cfg->writeback_cache)
|
||||
l::tweak_flags_writeback_cache(&ffi_->flags);
|
||||
|
|
|
|||
|
|
@ -17,23 +17,22 @@
|
|||
#include "config.hpp"
|
||||
#include "errno.hpp"
|
||||
#include "fileinfo.hpp"
|
||||
#include "fs_lchmod.hpp"
|
||||
#include "fs_cow.hpp"
|
||||
#include "fs_fchmod.hpp"
|
||||
#include "fs_lchmod.hpp"
|
||||
#include "fs_open.hpp"
|
||||
#include "fs_path.hpp"
|
||||
#include "fs_stat.hpp"
|
||||
#include "procfs_get_name.hpp"
|
||||
#include "stat_util.hpp"
|
||||
#include "ugid.hpp"
|
||||
|
||||
#include "fuse.h"
|
||||
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
|
||||
namespace l
|
||||
{
|
||||
|
|
@ -46,8 +45,8 @@ namespace l
|
|||
|
||||
static
|
||||
int
|
||||
lchmod_and_open_if_not_writable_and_empty(const string &fullpath_,
|
||||
const int flags_)
|
||||
lchmod_and_open_if_not_writable_and_empty(const std::string &fullpath_,
|
||||
const int flags_)
|
||||
{
|
||||
int rv;
|
||||
struct stat st;
|
||||
|
|
@ -86,7 +85,7 @@ namespace l
|
|||
case NFSOpenHack::ENUM::GIT:
|
||||
if(l::rdonly(flags_))
|
||||
return (errno=EACCES,-1);
|
||||
if(fullpath_.find("/.git/") == string::npos)
|
||||
if(fullpath_.find("/.git/") == std::string::npos)
|
||||
return (errno=EACCES,-1);
|
||||
return l::lchmod_and_open_if_not_writable_and_empty(fullpath_,flags_);
|
||||
case NFSOpenHack::ENUM::ALL:
|
||||
|
|
@ -118,6 +117,7 @@ namespace l
|
|||
static
|
||||
void
|
||||
config_to_ffi_flags(Config::Read &cfg_,
|
||||
const int tid_,
|
||||
fuse_file_info_t *ffi_)
|
||||
{
|
||||
switch(cfg_->cache_files)
|
||||
|
|
@ -147,12 +147,29 @@ namespace l
|
|||
ffi_->keep_cache = 0;
|
||||
ffi_->auto_cache = 1;
|
||||
break;
|
||||
case CacheFiles::ENUM::PER_PROCESS:
|
||||
std::string proc_name;
|
||||
|
||||
proc_name = procfs::get_name(tid_);
|
||||
if(cfg_->cache_files_process_names.count(proc_name) == 0)
|
||||
{
|
||||
ffi_->direct_io = 1;
|
||||
ffi_->keep_cache = 0;
|
||||
ffi_->auto_cache = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
ffi_->direct_io = 0;
|
||||
ffi_->keep_cache = 0;
|
||||
ffi_->auto_cache = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
open_core(const string &basepath_,
|
||||
open_core(const std::string &basepath_,
|
||||
const char *fusepath_,
|
||||
const int flags_,
|
||||
const bool link_cow_,
|
||||
|
|
@ -160,7 +177,7 @@ namespace l
|
|||
uint64_t *fh_)
|
||||
{
|
||||
int fd;
|
||||
string fullpath;
|
||||
std::string fullpath;
|
||||
|
||||
fullpath = fs::path::make(basepath_,fusepath_);
|
||||
|
||||
|
|
@ -209,7 +226,7 @@ namespace FUSE
|
|||
const fuse_context *fc = fuse_get_context();
|
||||
const ugid::Set ugid(fc->uid,fc->gid);
|
||||
|
||||
l::config_to_ffi_flags(cfg,ffi_);
|
||||
l::config_to_ffi_flags(cfg,fc->pid,ffi_);
|
||||
|
||||
if(cfg->writeback_cache)
|
||||
l::tweak_flags_writeback_cache(&ffi_->flags);
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#include "fs_umount2.hpp"
|
||||
#include "mergerfs.hpp"
|
||||
#include "option_parser.hpp"
|
||||
#include "procfs_get_name.hpp"
|
||||
#include "resources.hpp"
|
||||
#include "strvec.hpp"
|
||||
|
||||
|
|
@ -235,6 +236,8 @@ namespace l
|
|||
if(cfg->lazy_umount_mountpoint)
|
||||
l::lazy_umount(cfg->mountpoint);
|
||||
|
||||
procfs::init();
|
||||
|
||||
return fuse_main(args.argc,
|
||||
args.argv,
|
||||
&ops);
|
||||
|
|
|
|||
54
src/procfs_get_name.cpp
Normal file
54
src/procfs_get_name.cpp
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE
|
||||
#endif
|
||||
|
||||
#include "procfs_get_name.hpp"
|
||||
|
||||
#include "errno.hpp"
|
||||
#include "fs_close.hpp"
|
||||
#include "fs_open.hpp"
|
||||
#include "fs_openat.hpp"
|
||||
#include "fs_read.hpp"
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
static int g_PROCFS_DIR_FD = -1;
|
||||
const char PROCFS_PATH[] = "/proc";
|
||||
|
||||
int
|
||||
procfs::init()
|
||||
{
|
||||
if(g_PROCFS_DIR_FD != -1)
|
||||
return 0;
|
||||
|
||||
g_PROCFS_DIR_FD = fs::open(PROCFS_PATH,O_PATH|O_DIRECTORY);
|
||||
if(g_PROCFS_DIR_FD == -1)
|
||||
return -errno;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
std::string
|
||||
procfs::get_name(const int tid_)
|
||||
{
|
||||
int fd;
|
||||
int rv;
|
||||
char commpath[256];
|
||||
|
||||
snprintf(commpath,sizeof(commpath),"%d/comm",tid_);
|
||||
|
||||
fd = fs::openat(g_PROCFS_DIR_FD,commpath,O_RDONLY);
|
||||
if(fd < 0)
|
||||
return {};
|
||||
|
||||
rv = fs::read(fd,commpath,sizeof(commpath));
|
||||
if(rv == -1)
|
||||
return {};
|
||||
|
||||
// Overwrite the newline with NUL
|
||||
commpath[rv-1] = '\0';
|
||||
|
||||
fs::close(fd);
|
||||
|
||||
return commpath;
|
||||
}
|
||||
27
src/procfs_get_name.hpp
Normal file
27
src/procfs_get_name.hpp
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
/*
|
||||
ISC License
|
||||
|
||||
Copyright (c) 2023, Antonio SJ Musumeci <trapexit@spawn.link>
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted, provided that the above
|
||||
copyright notice and this permission notice appear in all copies.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace procfs
|
||||
{
|
||||
int init();
|
||||
std::string get_name(const int tid);
|
||||
}
|
||||
32
src/str.cpp
32
src/str.cpp
|
|
@ -40,6 +40,18 @@ namespace str
|
|||
result_->push_back(part);
|
||||
}
|
||||
|
||||
void
|
||||
split(const char *str_,
|
||||
const char delimiter_,
|
||||
set<string> *result_)
|
||||
{
|
||||
string part;
|
||||
istringstream ss(str_);
|
||||
|
||||
while(std::getline(ss,part,delimiter_))
|
||||
result_->insert(part);
|
||||
}
|
||||
|
||||
void
|
||||
split(const string &str_,
|
||||
const char delimiter_,
|
||||
|
|
@ -48,6 +60,14 @@ namespace str
|
|||
return str::split(str_.c_str(),delimiter_,result_);
|
||||
}
|
||||
|
||||
void
|
||||
split(const string &str_,
|
||||
const char delimiter_,
|
||||
set<string> *result_)
|
||||
{
|
||||
return str::split(str_.c_str(),delimiter_,result_);
|
||||
}
|
||||
|
||||
void
|
||||
rsplit1(const string &str_,
|
||||
const char delimiter_,
|
||||
|
|
@ -112,16 +132,10 @@ namespace str
|
|||
const char sep_)
|
||||
{
|
||||
string rv;
|
||||
set<string>::iterator i;
|
||||
|
||||
if(set_.empty())
|
||||
return string();
|
||||
|
||||
i = set_.begin();
|
||||
rv += *i;
|
||||
++i;
|
||||
for(; i != set_.end(); ++i)
|
||||
rv += sep_ + *i;
|
||||
for(auto const &s : set_)
|
||||
rv += s + sep_;
|
||||
rv.pop_back();
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,15 @@ namespace str
|
|||
const char delimiter,
|
||||
std::vector<std::string> *result);
|
||||
|
||||
void
|
||||
split(const char *str,
|
||||
const char delimiter,
|
||||
std::set<std::string> *result);
|
||||
void
|
||||
split(const std::string &str,
|
||||
const char delimiter,
|
||||
std::set<std::string> *result);
|
||||
|
||||
void
|
||||
rsplit1(const std::string &str,
|
||||
const char delimiter,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue