[arvados] updated: 2.1.0-3182-g4a832a93c

[git repository hosting]

Summary of changes:
 services/fuse/arvados_fuse/command.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

       via  4a832a93cd0baf253575936a79f83bcc4f666a82 (commit)
       via  9de07978f7d349777e2a7a8d186810667952e868 (commit)
      from  6cb6d4343e0d80e84e46b1e4f11a7cb2f0e06fd9 (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 4a832a93cd0baf253575936a79f83bcc4f666a82
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Dec 15 13:21:41 2022 -0500

    19872: Fix call to setrlimit
    
    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 05198d1b0..e275825a6 100644
--- a/services/fuse/arvados_fuse/command.py
+++ b/services/fuse/arvados_fuse/command.py
@@ -137,10 +137,12 @@ class Mount(object):
         try:
             nofile_limit = resource.getrlimit(resource.RLIMIT_NOFILE)
             if nofile_limit[0] < 10240:
-                resource.setrlimit(resource.RLIMIT_NOFILE, min(10240, nofile_limit[1]))
+                resource.setrlimit(resource.RLIMIT_NOFILE, (min(10240, nofile_limit[1]), nofile_limit[1]))
         except Exception as e:
             self.logger.warning("arv-mount: unable to adjust file handle limit: %s", e)
 
+        self.logger.debug("arv-mount: file handle limit is %s", resource.getrlimit(resource.RLIMIT_NOFILE))
+
         try:
             self._setup_logging()
             self._setup_api()

commit 9de07978f7d349777e2a7a8d186810667952e868
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Dec 15 13:18:12 2022 -0500

    19872: Fix typo
    
    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 e232b65ec..05198d1b0 100644
--- a/services/fuse/arvados_fuse/command.py
+++ b/services/fuse/arvados_fuse/command.py
@@ -137,7 +137,7 @@ class Mount(object):
         try:
             nofile_limit = resource.getrlimit(resource.RLIMIT_NOFILE)
             if nofile_limit[0] < 10240:
-                resource.getslimit(resource.RLIMIT_NOFILE, min(10240, nofile_limit[1]))
+                resource.setrlimit(resource.RLIMIT_NOFILE, min(10240, nofile_limit[1]))
         except Exception as e:
             self.logger.warning("arv-mount: unable to adjust file handle limit: %s", e)
 

-----------------------------------------------------------------------


hooks/post-receive
--