[arvados] updated: 2.7.0-5454-g7982e6ae73
git repository hosting
git at public.arvados.org
Tue Nov 28 21:32:30 UTC 2023
Summary of changes:
services/fuse/arvados_fuse/command.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
via 7982e6ae73cc314954a86514bf54b10c38ee592d (commit)
from a5ea331da0b2e58c686c490f4274ecadccc67355 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 7982e6ae73cc314954a86514bf54b10c38ee592d
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Tue Nov 28 16:31:44 2023 -0500
21223: Cast to int
Also set up logging first so that any issues with setting NOFILE get
logged here.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/services/fuse/arvados_fuse/command.py b/services/fuse/arvados_fuse/command.py
index bde96ade19..75ff4c132e 100644
--- a/services/fuse/arvados_fuse/command.py
+++ b/services/fuse/arvados_fuse/command.py
@@ -134,6 +134,12 @@ class Mount(object):
if self.args.logfile:
self.args.logfile = os.path.realpath(self.args.logfile)
+ try:
+ self._setup_logging()
+ except Exception as e:
+ self.logger.exception("arv-mount: exception during setup: %s", e)
+ exit(1)
+
try:
nofile_limit = resource.getrlimit(resource.RLIMIT_NOFILE)
@@ -143,7 +149,7 @@ class Mount(object):
# the desired cache size. Multiply by 8 because the
# number of 64 MiB cache slots that keepclient
# allocates is RLIMIT_NOFILE / 8
- minlimit = (self.args.file_cache/(64*1024*1024)) * 8
+ minlimit = int((self.args.file_cache/(64*1024*1024)) * 8)
if nofile_limit[0] < minlimit:
resource.setrlimit(resource.RLIMIT_NOFILE, (min(minlimit, nofile_limit[1]), nofile_limit[1]))
@@ -153,7 +159,6 @@ class Mount(object):
self.logger.info("arv-mount: RLIMIT_NOFILE is %s", resource.getrlimit(resource.RLIMIT_NOFILE))
try:
- self._setup_logging()
self._setup_api()
self._setup_mount()
except Exception as e:
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list