From 9c09b4061aa60bf179e3a09acacd3d4378da8849 Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 12 Nov 2021 22:57:36 +0100 Subject: [PATCH] prefer fpool on linux as well --- contrib/systemd/copyparty.service | 1 - copyparty/svchub.py | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/systemd/copyparty.service b/contrib/systemd/copyparty.service index b4a17894..900065a5 100644 --- a/contrib/systemd/copyparty.service +++ b/contrib/systemd/copyparty.service @@ -12,7 +12,6 @@ # change '/mnt::rw' to another location or permission-set # remove '-p 80,443,3923' to only listen on port 3923 # add '-i 127.0.0.1' to only allow local connections -# add '--use-fpool' if uploading into nfs locations # # with `Type=notify`, copyparty will signal systemd when it is ready to # accept connections; correctly delaying units depending on copyparty. diff --git a/copyparty/svchub.py b/copyparty/svchub.py index 7e62aee3..5d226c42 100644 --- a/copyparty/svchub.py +++ b/copyparty/svchub.py @@ -57,8 +57,10 @@ class SvcHub(object): if args.log_thrs: start_log_thrs(self.log, args.log_thrs, 0) - if not ANYWIN and not args.use_fpool: + if not args.use_fpool and args.j != 1: args.no_fpool = True + m = "multithreading enabled with -j {}, so disabling fpool -- this can reduce upload performance on some filesystems" + self.log("root", m.format(args.j)) if not args.no_fpool and args.j != 1: m = "WARNING: --use-fpool combined with multithreading is untested and can probably cause undefined behavior"