Mirror
/
mergerfs
mirror of https://github.com/trapexit/mergerfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Ensure backward compatibility with remember & noforget (#1566)

pull/1568/head
trapexit 7 days ago
committed by GitHub
parent
3a7a4a13e7
commit
4aab008233
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
4 changed files with 58 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      mkdocs/docs/remote_filesystems.md
  2. 72
      src/config.cpp
  3. 28
      src/config.hpp
  4. 2
      src/from_string.cpp

2
mkdocs/docs/remote_filesystems.md
View File

@ -76,7 +76,7 @@ but if you run into problems it may be worth trying Samba/SMB.
**mergerfs settings:** **mergerfs settings:**
* `noforget` or `remember-nodes=SECONDS`
* `never-forget-nodes=true` or `remember-nodes=SECONDS`
* `inodecalc=path-hash` * `inodecalc=path-hash`
* `lazy-umount-mountpoint=false` * `lazy-umount-mountpoint=false`

72
src/config.cpp
View File

@ -95,8 +95,6 @@ Config::Config()
cache_writeback(false), cache_writeback(false),
category(func), category(func),
config_file(), config_file(),
congestion_threshold(fuse_cfg.congestion_threshold,0),
debug(fuse_cfg.debug,false),
direct_io_allow_mmap(true), direct_io_allow_mmap(true),
dropcacheonclose(false), dropcacheonclose(false),
export_support(true), export_support(true),
@ -105,7 +103,6 @@ Config::Config()
fsname(), fsname(),
func(), func(),
fuse_msg_size("1M"), fuse_msg_size("1M"),
gid(fuse_cfg.gid,FUSE_CFG_INVALID_ID),
gid_cache_expire_timeout(60 * 60), gid_cache_expire_timeout(60 * 60),
gid_cache_remove_timeout(60 * 60 * 12), gid_cache_remove_timeout(60 * 60 * 12),
handle_killpriv(true), handle_killpriv(true),
@ -117,14 +114,10 @@ Config::Config()
link_cow(false), link_cow(false),
link_exdev(LinkEXDEV::ENUM::PASSTHROUGH), link_exdev(LinkEXDEV::ENUM::PASSTHROUGH),
log_metrics(false), log_metrics(false),
max_background(fuse_cfg.max_background,0),
minfreespace(branches.minfreespace,MINFREESPACE_DEFAULT), minfreespace(branches.minfreespace,MINFREESPACE_DEFAULT),
mountpoint(), mountpoint(),
_mount(mountpoint),
_mountpoint(mountpoint),
moveonenospc(true), moveonenospc(true),
nfsopenhack(NFSOpenHack::ENUM::OFF), nfsopenhack(NFSOpenHack::ENUM::OFF),
noforget(),
nullrw(false), nullrw(false),
parallel_direct_writes(true), parallel_direct_writes(true),
passthrough_io(PassthroughIO::ENUM::OFF), passthrough_io(PassthroughIO::ENUM::OFF),
@ -137,7 +130,6 @@ Config::Config()
read_thread_count(fuse_cfg.read_thread_count,0), read_thread_count(fuse_cfg.read_thread_count,0),
readahead(0), readahead(0),
readdir("seq"), readdir("seq"),
remember_nodes(fuse_cfg.remember_nodes,0),
rename_exdev(RenameEXDEV::ENUM::PASSTHROUGH), rename_exdev(RenameEXDEV::ENUM::PASSTHROUGH),
scheduling_priority(-10), scheduling_priority(-10),
security_capability(true), security_capability(true),
@ -146,11 +138,23 @@ Config::Config()
statfs_ignore(StatFSIgnore::ENUM::NONE), statfs_ignore(StatFSIgnore::ENUM::NONE),
symlinkify(false), symlinkify(false),
symlinkify_timeout(3600), symlinkify_timeout(3600),
threads(fuse_cfg.read_thread_count),
uid(fuse_cfg.uid,FUSE_CFG_INVALID_ID),
umask(fuse_cfg.umask,FUSE_CFG_INVALID_UMASK),
version(MERGERFS_VERSION),
xattr(XAttr::ENUM::PASSTHROUGH), xattr(XAttr::ENUM::PASSTHROUGH),
_congestion_threshold(fuse_cfg.congestion_threshold,0),
_debug(fuse_cfg.debug,false),
_gid(fuse_cfg.gid,FUSE_CFG_INVALID_ID),
_max_background(fuse_cfg.max_background,0),
_mount(mountpoint),
_mountpoint(mountpoint),
_never_forget_nodes(),
_noforget(),
_remember(fuse_cfg.remember_nodes),
_remember_nodes(fuse_cfg.remember_nodes,0),
_threads(fuse_cfg.read_thread_count),
_uid(fuse_cfg.uid,FUSE_CFG_INVALID_ID),
_umask(fuse_cfg.umask,FUSE_CFG_INVALID_UMASK),
_version(MERGERFS_VERSION),
_initialized(false) _initialized(false)
{ {
allow_idmap.ro = allow_idmap.ro =
@ -159,7 +163,7 @@ Config::Config()
branches_mount_timeout_fail.ro = branches_mount_timeout_fail.ro =
cache_symlinks.ro = cache_symlinks.ro =
cache_writeback.ro = cache_writeback.ro =
congestion_threshold.ro =
_congestion_threshold.ro =
direct_io_allow_mmap.ro = direct_io_allow_mmap.ro =
export_support.ro = export_support.ro =
fsname.ro = fsname.ro =
@ -167,7 +171,7 @@ Config::Config()
handle_killpriv.ro = handle_killpriv.ro =
handle_killpriv_v2.ro = handle_killpriv_v2.ro =
kernel_permissions_check.ro = kernel_permissions_check.ro =
max_background.ro =
_max_background.ro =
_mount.ro = _mount.ro =
_mountpoint.ro = _mountpoint.ro =
nullrw.ro = nullrw.ro =
@ -179,15 +183,17 @@ Config::Config()
read_thread_count.ro = read_thread_count.ro =
scheduling_priority.ro = scheduling_priority.ro =
srcmounts.ro = srcmounts.ro =
version.ro =
_version.ro =
true; true;
congestion_threshold.display =
gid.display =
max_background.display =
threads.display =
_congestion_threshold.display =
_gid.display =
_max_background.display =
_mount.display = _mount.display =
uid.display =
umask.display =
_noforget.display =
_remember.display =
_uid.display =
_umask.display =
_threads.display =
false; false;
_map["allow-idmap"] = &allow_idmap; _map["allow-idmap"] = &allow_idmap;
@ -212,10 +218,10 @@ Config::Config()
_map["category.create"] = &category.create; _map["category.create"] = &category.create;
_map["category.search"] = &category.search; _map["category.search"] = &category.search;
_map["config"] = &config_file; _map["config"] = &config_file;
_map["debug"] = &_debug;
_map["defaults"] = &_dummy; _map["defaults"] = &_dummy;
_map["debug"] = &debug;
_map["direct-io-allow-mmap"] = &direct_io_allow_mmap;
_map["direct-io"] = &_dummy; _map["direct-io"] = &_dummy;
_map["direct-io-allow-mmap"] = &direct_io_allow_mmap;
_map["dropcacheonclose"] = &dropcacheonclose; _map["dropcacheonclose"] = &dropcacheonclose;
_map["export-support"] = &export_support; _map["export-support"] = &export_support;
_map["flush-on-close"] = &flushonclose; _map["flush-on-close"] = &flushonclose;
@ -243,7 +249,7 @@ Config::Config()
_map["func.unlink"] = &func.unlink; _map["func.unlink"] = &func.unlink;
_map["func.utimens"] = &func.utimens; _map["func.utimens"] = &func.utimens;
_map["fuse-msg-size"] = &fuse_msg_size; _map["fuse-msg-size"] = &fuse_msg_size;
_map["gid"] = &gid;
_map["gid"] = &_gid;
_map["gid-cache.expire-timeout"] = &gid_cache_expire_timeout; _map["gid-cache.expire-timeout"] = &gid_cache_expire_timeout;
_map["gid-cache.remove-timeout"] = &gid_cache_remove_timeout; _map["gid-cache.remove-timeout"] = &gid_cache_remove_timeout;
_map["handle-killpriv"] = &handle_killpriv; _map["handle-killpriv"] = &handle_killpriv;
@ -251,22 +257,23 @@ Config::Config()
_map["hard-remove"] = &_dummy; _map["hard-remove"] = &_dummy;
_map["ignorepponrename"] = &ignorepponrename; _map["ignorepponrename"] = &ignorepponrename;
_map["inodecalc"] = &inodecalc; _map["inodecalc"] = &inodecalc;
_map["kernel-permissions-check"] = &kernel_permissions_check;
_map["kernel-cache"] = &_dummy; _map["kernel-cache"] = &_dummy;
_map["kernel-permissions-check"] = &kernel_permissions_check;
_map["lazy-umount-mountpoint"] = &lazy_umount_mountpoint; _map["lazy-umount-mountpoint"] = &lazy_umount_mountpoint;
_map["link-exdev"] = &link_exdev;
_map["link-cow"] = &link_cow; _map["link-cow"] = &link_cow;
_map["link-exdev"] = &link_exdev;
_map["log.metrics"] = &log_metrics; _map["log.metrics"] = &log_metrics;
_map["minfreespace"] = &minfreespace; _map["minfreespace"] = &minfreespace;
_map["mount"] = &_mount; _map["mount"] = &_mount;
_map["mountpoint"] = &_mountpoint; _map["mountpoint"] = &_mountpoint;
_map["moveonenospc"] = &moveonenospc; _map["moveonenospc"] = &moveonenospc;
_map["negative-entry"] = &_dummy; _map["negative-entry"] = &_dummy;
_map["never-forget-nodes"] = &_never_forget_nodes;
_map["nfsopenhack"] = &nfsopenhack; _map["nfsopenhack"] = &nfsopenhack;
_map["no-splice-move"] = &_dummy; _map["no-splice-move"] = &_dummy;
_map["no-splice-read"] = &_dummy; _map["no-splice-read"] = &_dummy;
_map["no-splice-write"] = &_dummy; _map["no-splice-write"] = &_dummy;
_map["noforget"] = &noforget;
_map["noforget"] = &_noforget;
_map["nonempty"] = &_dummy; _map["nonempty"] = &_dummy;
_map["nullrw"] = &nullrw; _map["nullrw"] = &nullrw;
_map["parallel-direct-writes"] = &parallel_direct_writes; _map["parallel-direct-writes"] = &parallel_direct_writes;
@ -280,7 +287,8 @@ Config::Config()
_map["proxy-ioprio"] = &proxy_ioprio; _map["proxy-ioprio"] = &proxy_ioprio;
_map["read-thread-count"] = &read_thread_count; _map["read-thread-count"] = &read_thread_count;
_map["readahead"] = &readahead; _map["readahead"] = &readahead;
_map["remember-nodes"] = &remember_nodes;
_map["remember"] = &_remember;
_map["remember-nodes"] = &_remember_nodes;
_map["rename-exdev"] = &rename_exdev; _map["rename-exdev"] = &rename_exdev;
_map["scheduling-priority"] = &scheduling_priority; _map["scheduling-priority"] = &scheduling_priority;
_map["security-capability"] = &security_capability; _map["security-capability"] = &security_capability;
@ -292,11 +300,11 @@ Config::Config()
_map["statfs-ignore"] = &statfs_ignore; _map["statfs-ignore"] = &statfs_ignore;
_map["symlinkify"] = &symlinkify; _map["symlinkify"] = &symlinkify;
_map["symlinkify-timeout"] = &symlinkify_timeout; _map["symlinkify-timeout"] = &symlinkify_timeout;
_map["threads"] = &threads;
_map["uid"] = &uid;
_map["umask"] = &umask;
_map["threads"] = &_threads;
_map["uid"] = &_uid;
_map["umask"] = &_umask;
_map["use-ino"] = &_dummy; _map["use-ino"] = &_dummy;
_map["version"] = &version;
_map["version"] = &_version;
_map["xattr"] = &xattr; _map["xattr"] = &xattr;
} }

28
src/config.hpp
View File

@ -125,8 +125,6 @@ public:
ConfigBOOL cache_writeback; ConfigBOOL cache_writeback;
Categories category; Categories category;
CfgConfigFile config_file; CfgConfigFile config_file;
TFSRef<int> congestion_threshold;
TFSRef<bool> debug;
ConfigBOOL direct_io_allow_mmap; ConfigBOOL direct_io_allow_mmap;
ConfigBOOL dropcacheonclose; ConfigBOOL dropcacheonclose;
ConfigBOOL export_support; ConfigBOOL export_support;
@ -135,7 +133,6 @@ public:
ConfigSTR fsname; ConfigSTR fsname;
Funcs func; Funcs func;
ConfigPageSize fuse_msg_size; ConfigPageSize fuse_msg_size;
TFSRef<s64> gid;
GIDCacheExpireTimeout gid_cache_expire_timeout; GIDCacheExpireTimeout gid_cache_expire_timeout;
GIDCacheRemoveTimeout gid_cache_remove_timeout; GIDCacheRemoveTimeout gid_cache_remove_timeout;
ConfigBOOL handle_killpriv; ConfigBOOL handle_killpriv;
@ -147,14 +144,10 @@ public:
ConfigBOOL link_cow; ConfigBOOL link_cow;
LinkEXDEV link_exdev; LinkEXDEV link_exdev;
LogMetrics log_metrics; LogMetrics log_metrics;
TFSRef<int> max_background;
TFSRef<u64> minfreespace; TFSRef<u64> minfreespace;
fs::path mountpoint; fs::path mountpoint;
TFSRef<fs::path> _mount;
TFSRef<fs::path> _mountpoint;
MoveOnENOSPC moveonenospc; MoveOnENOSPC moveonenospc;
NFSOpenHack nfsopenhack; NFSOpenHack nfsopenhack;
CfgNoforget noforget;
ConfigBOOL nullrw; ConfigBOOL nullrw;
ConfigBOOL parallel_direct_writes; ConfigBOOL parallel_direct_writes;
PassthroughIO passthrough_io; PassthroughIO passthrough_io;
@ -168,7 +161,6 @@ public:
TFSRef<int> read_thread_count; TFSRef<int> read_thread_count;
ConfigUINT64 readahead; ConfigUINT64 readahead;
FUSE::ReadDir readdir; FUSE::ReadDir readdir;
TFSRef<s64> remember_nodes;
RenameEXDEV rename_exdev; RenameEXDEV rename_exdev;
ConfigINT scheduling_priority; ConfigINT scheduling_priority;
ConfigBOOL security_capability; ConfigBOOL security_capability;
@ -177,14 +169,24 @@ public:
StatFSIgnore statfs_ignore; StatFSIgnore statfs_ignore;
ConfigBOOL symlinkify; ConfigBOOL symlinkify;
ConfigS64 symlinkify_timeout; ConfigS64 symlinkify_timeout;
TFSRef<int> threads;
TFSRef<s64> uid;
TFSRef<s64> umask;
ConfigROSTR version;
XAttr xattr; XAttr xattr;
private: private:
CfgDummy _dummy;
TFSRef<int> _congestion_threshold;
TFSRef<bool> _debug;
CfgDummy _dummy;
TFSRef<s64> _gid;
TFSRef<int> _max_background;
TFSRef<fs::path> _mount;
TFSRef<fs::path> _mountpoint;
CfgNoforget _never_forget_nodes;
CfgNoforget _noforget;
TFSRef<s64> _remember;
TFSRef<s64> _remember_nodes;
TFSRef<int> _threads;
TFSRef<s64> _uid;
TFSRef<s64> _umask;
ConfigROSTR _version;
private: private:
bool _initialized; bool _initialized;

2
src/from_string.cpp
View File

@ -31,11 +31,13 @@ str::from(const std::string_view value_,
bool *bool_) bool *bool_)
{ {
if((value_ == "true") || if((value_ == "true") ||
(value_ == "t") ||
(value_ == "1") || (value_ == "1") ||
(value_ == "on") || (value_ == "on") ||
(value_ == "yes")) (value_ == "yes"))
*bool_ = true; *bool_ = true;
ef((value_ == "false") || ef((value_ == "false") ||
(value_ == "f") ||
(value_ == "0") || (value_ == "0") ||
(value_ == "off") || (value_ == "off") ||
(value_ == "no")) (value_ == "no"))

Write Preview
Loading…
Cancel
Save