[arvados] updated: 2.7.1-3-g0ce14fcb6d
git repository hosting
git at public.arvados.org
Thu Jan 4 16:52:57 UTC 2024
Summary of changes:
sdk/cli/arvados-cli.gemspec | 2 +-
sdk/ruby/arvados.gemspec | 2 +-
services/fuse/arvados_fuse/unmount.py | 10 ++++++++++
3 files changed, 12 insertions(+), 2 deletions(-)
via 0ce14fcb6dbaf3287c6092e43a07f1efffbbdd55 (commit)
via cd4857cb1f7452bb23bda7ac3259e4c2cb154554 (commit)
via eab1c79566f15aec5f8e6df2bd82c0dd6d19b609 (commit)
from e082e93a4267a28d37d6d3cf5796bc961af3054a (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 0ce14fcb6dbaf3287c6092e43a07f1efffbbdd55
Merge: e082e93a42 cd4857cb1f
Author: Tom Clegg <tom at curii.com>
Date: Thu Jan 4 11:52:17 2024 -0500
Merge branch '21301-ruby3-incompat' into 2.7-staging
fixes #21301
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
commit cd4857cb1f7452bb23bda7ac3259e4c2cb154554
Author: Tom Clegg <tom at curii.com>
Date: Fri Nov 10 17:18:13 2023 -0500
20846: Avoid deadlock in unmount-and-replace race.
refs #20846
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/services/fuse/arvados_fuse/unmount.py b/services/fuse/arvados_fuse/unmount.py
index 12d047a8f3..144c582ddc 100644
--- a/services/fuse/arvados_fuse/unmount.py
+++ b/services/fuse/arvados_fuse/unmount.py
@@ -154,6 +154,16 @@ def unmount(path, subtype=None, timeout=10, recursive=False):
path = os.path.realpath(path)
continue
elif not mounted:
+ if was_mounted:
+ # This appears to avoid a race condition where we
+ # return control to the caller after running
+ # "fusermount -u -z" (see below), the caller (e.g.,
+ # arv-mount --replace) immediately tries to attach a
+ # new fuse mount at the same mount point, the
+ # lazy-unmount process unmounts that _new_ mount while
+ # it is being initialized, and the setup code waits
+ # forever for the new mount to be initialized.
+ time.sleep(1)
return was_mounted
if attempted:
commit eab1c79566f15aec5f8e6df2bd82c0dd6d19b609
Author: Tom Clegg <tom at curii.com>
Date: Wed Jan 3 13:58:17 2024 -0500
21301: Tag 2.7.2+ SDK and CLI gems as incompatible with Ruby 3.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index 1ff841acdd..89c2e46ea9 100644
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
s.files = ["bin/arv", "bin/arv-tag", "LICENSE-2.0.txt"]
s.executables << "arv"
s.executables << "arv-tag"
- s.required_ruby_version = '>= 2.1.0'
+ s.required_ruby_version = '>= 2.1.0', '< 3'
s.add_runtime_dependency 'arvados', '>= 1.4.1.20190320201707'
# Our google-api-client dependency used to be < 0.9, but that could be
# satisfied by the buggy 0.9.pre*, cf. https://dev.arvados.org/issues/9213
diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index b196a1c33e..a3ae32d87d 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
s.files = ["lib/arvados.rb", "lib/arvados/google_api_client.rb",
"lib/arvados/collection.rb", "lib/arvados/keep.rb",
"README", "LICENSE-2.0.txt"]
- s.required_ruby_version = '>= 1.8.7'
+ s.required_ruby_version = '>= 1.8.7', '< 3'
s.add_dependency('activesupport', '>= 3')
s.add_dependency('andand', '~> 1.3', '>= 1.3.3')
# Our google-api-client dependency used to be < 0.9, but that could be
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list