[ARVADOS] updated: a1fe9aad9d60ab2d61957bf32c0a4989636ad9b0
Git user
git at public.curoverse.com
Thu Mar 23 18:09:36 EDT 2017
Summary of changes:
.../app/views/projects/_show_dashboard.html.erb | 12 +-
.../app/views/work_units/_show_child.html.erb | 4 +-
.../test/controllers/disabled_api_test.rb | 11 ++
doc/_config.yml | 3 +
.../install-compute-node.html.textile.liquid | 6 +-
.../install-dispatch.html.textile.liquid | 15 ++
doc/install/install-api-server.html.textile.liquid | 86 ++-------
doc/install/install-ws.html.textile.liquid | 12 +-
doc/install/migrate-docker19.html.textile.liquid | 31 ++++
docker/migrate-docker19/Dockerfile | 31 ++++
docker/migrate-docker19/build.sh | 2 +
.../docker/run => docker/migrate-docker19/dnd.sh | 1 -
docker/migrate-docker19/migrate.sh | 41 +++++
sdk/cli/arvados-cli.gemspec | 2 +-
sdk/cli/test/test_arv-collection-create.rb | 1 +
sdk/python/arvados/api.py | 3 +-
sdk/python/arvados/cache.py | 71 +++++++
sdk/python/arvados/commands/keepdocker.py | 92 +++-------
sdk/python/arvados/commands/migrate19.py | 204 +++++++++++++++++++++
sdk/python/bin/arv-migrate-docker19 | 4 +-
sdk/python/tests/run_test_server.py | 19 +-
sdk/python/tests/test_arv_keepdocker.py | 44 ++---
sdk/python/tests/test_cache.py | 82 +++++++++
services/api/app/models/log.rb | 4 +-
services/api/config/application.default.yml | 18 ++
services/api/lib/audit_logs.rb | 65 +++++++
services/api/lib/crunch_dispatch.rb | 11 +-
services/api/test/fixtures/logs.yml | 4 +
services/api/test/unit/crunch_dispatch_test.rb | 8 +-
services/api/test/unit/fail_jobs_test.rb | 8 +-
services/api/test/unit/log_test.rb | 78 ++++++++
services/arv-git-httpd/arvados-git-httpd.service | 5 +
.../crunch-dispatch-slurm.service | 5 +
services/crunch-run/crunchrun.go | 176 +++++++++++++++---
services/crunch-run/crunchrun_test.go | 76 +++++++-
.../dockercleaner/arvados-docker-cleaner.service | 4 +
services/fuse/arvados_fuse/command.py | 1 -
services/fuse/arvados_fuse/unmount.py | 25 ++-
services/keep-balance/keep-balance.service | 4 +
services/keep-web/keep-web.service | 5 +
services/keepproxy/keepproxy.service | 5 +
services/keepstore/keepstore.service | 5 +
.../arvnodeman/computenode/dispatch/__init__.py | 4 -
.../arvnodeman/computenode/dispatch/slurm.py | 2 +-
services/nodemanager/arvnodeman/daemon.py | 48 +++--
services/nodemanager/tests/test_daemon.py | 21 ---
services/ws/arvados-ws.service | 5 +
47 files changed, 1081 insertions(+), 283 deletions(-)
create mode 100644 doc/install/migrate-docker19.html.textile.liquid
create mode 100644 docker/migrate-docker19/Dockerfile
create mode 100755 docker/migrate-docker19/build.sh
copy tools/arvbox/lib/arvbox/docker/service/docker/run => docker/migrate-docker19/dnd.sh (98%)
create mode 100755 docker/migrate-docker19/migrate.sh
create mode 100644 sdk/python/arvados/cache.py
create mode 100644 sdk/python/arvados/commands/migrate19.py
create mode 100644 sdk/python/tests/test_cache.py
create mode 100644 services/api/lib/audit_logs.rb
via a1fe9aad9d60ab2d61957bf32c0a4989636ad9b0 (commit)
via 1c999994ed03a717ea219290072c2dd5681a724e (commit)
via ae8aaa4c55762222c837fcce8e9ad6800ff8b128 (commit)
via b8000c3cb38b77c5c429e0fd591a43f5eeee64d1 (commit)
via 2e32ef1657b439c0398e66930c3d17437032fb1a (commit)
via 8ada36c931712304c4b2c70bdcbc316b1ad2c4e2 (commit)
via 4600343d1bff7ac4f7b9f08486541444c31af8b6 (commit)
via fd7767148061d21b77bd97a8856191d6c9bbc077 (commit)
via 6722b420effcab24dffd9b47fa277f8830bd4cca (commit)
via a8378b8deaa2bbf9d2c154d9d9bb072538c288cc (commit)
via 2aef6ca08d80c0fd25d74ddb9ab52cf535a33d3e (commit)
via 5aeebd0cdbabb1cfc815b21b26fb87622b05f6fe (commit)
via e8cc0d73309236d6efc243371969f83808e42d30 (commit)
via 1667f9860de21d29bbe32bb827db29eca62d9aeb (commit)
via c56743e301b49163a56482c13e49a01c9a0fd7dc (commit)
via ae970cb115251915c0a8e1052b23acdd2ab70fee (commit)
via a67faeeb159323d35d2a3229c7b5d014dc175767 (commit)
via 82ff0337a99b7aaed626a624633b8c068dc5e142 (commit)
via 950ae9635334cd1ca6a2738b185f6481cc3d771f (commit)
via 83203f5c739ee0b0199e76babccb60e832a0de8e (commit)
via 7772dca4096e64b1033fb9f42e604699ce07f782 (commit)
via 514cd364c3cb27b633c1368cd06d6a54927c98a8 (commit)
via 366780077def317818759e999263577d8a9f5064 (commit)
via e47fe8663303df51081a77646e061b11aa892df1 (commit)
via f0a34ecb9b41b7d4e35575803ba3dc283f369724 (commit)
via 8d2dd8003b6e865033e372b5db76fc2244378964 (commit)
via dc6c3fccb583ae98eee808addb526c45ebdbf2c6 (commit)
via bc8a4a8863f147e4c0b95d0aa3e2f3e549637ee4 (commit)
via 262d1e44ddaf3f014423a4acf96a3a6200279820 (commit)
via a54e88868ac259443e2cd8d5f6fddb4b8154acb9 (commit)
via 432e71aea50074b1674e96fb1a03cf512952ab75 (commit)
via 6b2005a2fa3e7c040f8db222010fa870f87336bf (commit)
via 5976c751048100e813edd638632927794df072f2 (commit)
via b50e323ec94e9c7355c6f1c5b93f488540d08ec3 (commit)
via 49510014c88646ef4320b137240966ba8f6d5108 (commit)
via 5689f1de6e1a263237303b73013dcebb4ad77e1f (commit)
via 2fd606b328508babad9af6c0a30c159568b525c2 (commit)
via 2741b54c38ed1e32cc9f0129614a00d84f51bca8 (commit)
via 8b278cdd80f8969a954a2c789281f8f63195e894 (commit)
via 077878d94771c25c25edfe01a98a523898916d9e (commit)
via f8084a54742def1915c9f4be290f9076033af152 (commit)
via 37e995fb7423b2b353c599e2a1b00bda7c29ee6f (commit)
via 79e53c0eed77396cb37f60b48be0c60fe7e0ab89 (commit)
via b77893f2a8ae755f22615054f2c267d990995e1c (commit)
via e20dfe63dea30fc45bd4fa50aa9d6b5ab1040c99 (commit)
via f31475dfeb37c0e4d6b5244cba3bbd06e323b8e8 (commit)
via db7c2ba7523fbce1dc47ea1a715a738a28b3bb3b (commit)
via 433cd703220880784c8dab316501d1c74b09e37b (commit)
via 9c99316ba4a62ab15b383a8e3b2ec6f4d7165a3e (commit)
via 03589784d8bc566305e1ea3473a8b37941147517 (commit)
via fd42d69ffa558918ec40f9aeaceb2cbf93de1e8a (commit)
via 99ee47018fcb7cff2adc9184e2063eeba9d55798 (commit)
via 2accec1f7ca3e2dd1e7fe9ee28bb6a8a6cb74abc (commit)
via de283bd8dd383a4177bb714212cf7c59f38a23d8 (commit)
via b30e81ee46c196476a03bc244fbc4419573ba34e (commit)
via da8c9048bf4f3a36f5691aa52e56e2db672dff3a (commit)
via 47178c71032b476e34fd0c6b10065e1b96a568f1 (commit)
via bf03dd4f523463b896428527fa0685631e9ac649 (commit)
via 996b635700d7270229200a56d2c2b9f7c96a84fb (commit)
via b60a21fe3482e1f7ca1815e2a90e276a8c377636 (commit)
via 2c69d491fbbd1461bb5a6dd9c0f0dd493081b45e (commit)
via 9f34ff6f6a6ea1d384528a093bad1c72bd2cea89 (commit)
via 73dbf5bf94b162e5e9ed74cb60f17ee2c7018059 (commit)
via 386faadf691e444b71d6c96e7c00792d9a0ba2c7 (commit)
via 8513e042b0033599146546bd3a2ad903c67c9ff5 (commit)
via 1230d8a106c5c62edcbb9fcf6d1b94585e5596b2 (commit)
via 54837bcae94d30f37f19e4ee436c2bb96bd8f21a (commit)
via eabc13f27dfb178069546202bca772f893bac81c (commit)
via dee634b21e48e467b0d7b5ef1b2965c1df5e41d1 (commit)
via f074ef8181c2b93cbfcd870eb67c8c95cb0e442a (commit)
via 2ed5325b37efa7aa9d38a60c1d5c8b4980df8489 (commit)
via 55c719bff1b34d037506639fd4cf7f0a74f4c3cb (commit)
via 6058f336a4562b6d6780c4fcfc4d28b6b2a51948 (commit)
via 1d7577d08b6ca646fcca0e941ce614c37051264e (commit)
via 205b07766565f3ce7b80bcdfee88f83af451fb01 (commit)
via 0eb521827f6a64e567722527f36f0b4d130af504 (commit)
via 273a233818ae39e843fab0276f9e381da6645d28 (commit)
from 5752685c137c5e37e13845f5328e9a3930fa3100 (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 a1fe9aad9d60ab2d61957bf32c0a4989636ad9b0
Merge: 1c99999 ae8aaa4
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Mar 23 18:07:29 2017 -0400
11209: Merge branch 'master' into 11209-unmount-replace
commit 1c999994ed03a717ea219290072c2dd5681a724e
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Mar 23 18:06:01 2017 -0400
11209: Try unmounting at least once even if timeout=0.
diff --git a/services/fuse/arvados_fuse/command.py b/services/fuse/arvados_fuse/command.py
index 883af36..fff0c99 100644
--- a/services/fuse/arvados_fuse/command.py
+++ b/services/fuse/arvados_fuse/command.py
@@ -11,7 +11,6 @@ import sys
import time
import arvados.commands._util as arv_cmd
-from arvados_fuse import crunchstat
from arvados_fuse import *
from arvados_fuse._version import __version__
diff --git a/services/fuse/arvados_fuse/unmount.py b/services/fuse/arvados_fuse/unmount.py
index ab5ce4f..7a7464d 100644
--- a/services/fuse/arvados_fuse/unmount.py
+++ b/services/fuse/arvados_fuse/unmount.py
@@ -62,12 +62,13 @@ def unmount(path, timeout=10):
path = os.path.realpath(path)
was_mounted = False
- t0 = time.time()
- delay = 0
- while True:
- if timeout and t0 + timeout < time.time():
- raise Exception("timed out")
+ attempted = False
+ if timeout is None:
+ deadline = None
+ else:
+ deadline = time.time() + timeout
+ while True:
mounted = False
for m in mountinfo():
if m.is_fuse:
@@ -81,6 +82,14 @@ def unmount(path, timeout=10):
if not mounted:
return was_mounted
+ if attempted:
+ delay = 1
+ if deadline:
+ delay = min(delay, deadline - time.time())
+ if delay <= 0:
+ raise Exception("timed out")
+ time.sleep(delay)
+
try:
with open('/sys/fs/fuse/connections/{}/abort'.format(m.minor),
'w') as f:
@@ -88,11 +97,9 @@ def unmount(path, timeout=10):
except OSError as e:
if e.errno != errno.ENOENT:
raise
+
+ attempted = True
try:
subprocess.check_call(["fusermount", "-u", "-z", path])
except subprocess.CalledProcessError:
pass
-
- time.sleep(delay)
- if delay == 0:
- delay = 1
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list