[ARVADOS] updated: 1.3.0-1432-gbb0794b33
Git user
git at public.curoverse.com
Thu Aug 1 15:46:53 UTC 2019
Summary of changes:
.../workbench/app/views/users/_show_admin.html.erb | 4 +-
apps/workbench/config/application.default.yml | 12 -
apps/workbench/config/arvados_config.rb | 4 +-
apps/workbench/npm_packages | 2 +-
.../controllers/healthcheck_controller_test.rb | 6 +-
.../test/integration/anonymous_access_test.rb | 4 -
.../workbench/test/integration/collections_test.rb | 4 -
apps/workbench/test/integration/download_test.rb | 4 -
apps/workbench/test/integration/jobs_test.rb | 5 -
.../test/integration/repositories_browse_test.rb | 5 +-
.../test/integration/user_settings_menu_test.rb | 2 +-
apps/workbench/test/integration_helper.rb | 13 -
build/run-tests.sh | 75 ++----
doc/install/install-composer.html.textile.liquid | 34 ++-
lib/cloud/ec2/ec2.go | 9 +-
lib/config/cmd.go | 2 +
lib/config/config.default.yml | 60 ++++-
lib/config/deprecated.go | 199 +++++++++++++-
lib/config/export.go | 8 +
lib/config/generated_config.go | 60 ++++-
lib/config/load.go | 33 ++-
lib/config/load_test.go | 81 +++++-
lib/controller/federation/conn.go | 9 +
lib/controller/handler.go | 16 +-
lib/controller/handler_test.go | 3 +
lib/controller/router/router.go | 7 +
lib/controller/rpc/conn.go | 7 +
sdk/go/arvados/api.go | 7 +-
sdk/go/arvados/config.go | 61 ++++-
sdk/go/arvados/config_test.go | 10 +
sdk/go/arvadostest/api.go | 5 +
sdk/go/dispatch/dispatch.go | 2 +-
sdk/python/arvados/events.py | 13 +-
sdk/python/tests/run_test_server.py | 286 ++++++++++-----------
.../api/app/controllers/application_controller.rb | 2 +-
.../arvados/v1/collections_controller.rb | 6 +-
.../controllers/arvados/v1/groups_controller.rb | 2 +-
.../controllers/arvados/v1/schema_controller.rb | 2 +-
services/api/app/mailers/admin_notifier.rb | 4 +-
services/api/app/models/arvados_model.rb | 2 +-
services/api/app/models/collection.rb | 2 +-
services/api/app/models/node.rb | 2 +-
services/api/app/models/repository.rb | 3 +
services/api/app/models/user.rb | 2 +-
services/api/config/application.default.yml | 1 -
services/api/config/arvados_config.rb | 26 +-
services/api/lib/enable_jobs_api.rb | 55 ++--
.../arvados/v1/groups_controller_test.rb | 2 +-
.../arvados/v1/healthcheck_controller_test.rb | 6 +-
.../functional/arvados/v1/jobs_controller_test.rb | 4 +-
.../arvados/v1/schema_controller_test.rb | 2 +-
services/api/test/unit/container_request_test.rb | 10 +-
services/api/test/unit/job_test.rb | 14 +-
services/api/test/unit/log_test.rb | 4 +-
services/api/test/unit/user_test.rb | 64 ++---
.../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 107 ++++----
.../crunch-dispatch-slurm_test.go | 96 +++----
services/crunch-run/git_mount_test.go | 10 +-
services/login-sync/Gemfile.lock | 2 +-
services/ws/config.go | 49 ----
services/ws/main.go | 54 ++--
services/ws/router.go | 12 +-
services/ws/server.go | 30 ++-
services/ws/server_test.go | 107 ++++++--
tools/arvbox/bin/arvbox | 1 +
tools/arvbox/lib/arvbox/docker/cluster-config.sh | 15 +-
.../lib/arvbox/docker/service/composer/run-service | 2 +-
tools/jenkins/submit-ci-dev.sh | 9 +
68 files changed, 1116 insertions(+), 645 deletions(-)
delete mode 100644 services/ws/config.go
create mode 100755 tools/jenkins/submit-ci-dev.sh
via bb0794b3323e93d45d85a0e86a497e8afe5a0983 (commit)
via a3ac6ea15e37aa903ed9dc8b31bac94d99093c2f (commit)
via f9d9a61219a3e23c1867d12596e6af8e550f0e50 (commit)
via dde5e6052a0b7547978d105ef3dfb5bf4a58eeda (commit)
via 0128e9d05f42469364aae8ca0eeae18b8abbe74b (commit)
via d0ecfaefd9ed9fab71e0cd8d62579a208f0eec5d (commit)
via 6c89457a8f144d03f230656a1f4c43675d066b8c (commit)
via adedc9a3791fbed1d08da4d8681f1d0e0b36e024 (commit)
via a93774da6449567a2759672cf329be6ec96f91e3 (commit)
via 1e9ae39f812c387d608bb815c5840ea2a99b5777 (commit)
via b326e357c9d906b8b3d536dc2b1f4356b6073a11 (commit)
via 1bc9d9cb0dac110676f9fd60b2fc128d54b1abf5 (commit)
via 2f659c39c923d90f1cceb73c123d661687c3a41e (commit)
via 3e9b9dcdcce3905fa33dde900ef99f27ba036fea (commit)
via f771c6733372f5fe91be11f22fc74cfb6274c8ee (commit)
via 0b90a6ee86fdfa5b2b8cb51d66d70cef00dc6800 (commit)
via 3596bdedbf0a592b3dd4bdcf589c3de7b8913ee1 (commit)
via ecbb701177f9ae8713d3e103b3014f10fe584025 (commit)
via 2ecb1b1e045897ac5d028ae371d19a7afa1ce2bf (commit)
via eae1dba3e92c386e03ff07c0e06ddb214f4c7e0a (commit)
via da77af55002ffc7581048f70b17ffc3c46bf86b0 (commit)
via 8168ab173ff7a09d25e1838732e4fbafee88df98 (commit)
via 639789ffd0d7a3271789b3ba45604a65cba92928 (commit)
via 431f22982dfee8f4d1c9590b3bce8d36709d5dd9 (commit)
via f89b45c97b047298c86dd58d5da8c07aa3d7d27e (commit)
via 8d152808d49ad6b1767b26ac10dffb53fb7940fe (commit)
via 4512b2324d203673a7b76927631a9bac4361d0de (commit)
via 35ba053c83b7ad18e1a336d50d3a8d5a53adce9f (commit)
via 9656b85278fa05b4118f98c987fec278168a4b1c (commit)
via 59a2d537f3450407aa48e32645d92a5246c046fe (commit)
via 7b4ec6d3c3ed209a42f542e1b646b8e672847fea (commit)
via bebedf99016c2a784bbeb4c64ce4a579b8649b13 (commit)
via b47472f012130d22bd30969b2a273b91ffe41b51 (commit)
via 3fbea8f4814e1bbc6ec650576daf63f72d121250 (commit)
via 72a8b3582d925ea30fe78697ff76bafb20d8bd9e (commit)
via 0e5ee27bb7bef018395a73f1fa2617050dc18d7a (commit)
via 40e3249b1f75ff1442adbc360885c80db436c50b (commit)
via 22422ab1e539977ca730aedd46b4cd919e73d05e (commit)
via f5ef76001884b7b464574c51783efc352f5e7532 (commit)
via f5e83a9498acb9e13847cf8c96429784c8440a0a (commit)
from eb1910c3d005ac0819416983262812b71edd85f3 (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 bb0794b3323e93d45d85a0e86a497e8afe5a0983
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Aug 1 11:45:20 2019 -0400
12020: Fix test race.
The previous fix still had a race bug: it assigned a truthy value to
PollClient._skip_old_events (thereby releasing the test from its wait
loop) before doing the logs().list() query to choose an event ID
threshold.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/sdk/python/arvados/events.py b/sdk/python/arvados/events.py
index 22364d2ae..e53e4980a 100644
--- a/sdk/python/arvados/events.py
+++ b/sdk/python/arvados/events.py
@@ -199,7 +199,11 @@ class PollClient(threading.Thread):
# filter on that same cutoff time, or
# (once we see our first matching event)
# the ID of the last-seen event.
- self._skip_old_events = [[
+ #
+ # Note: self._skip_old_events must not be
+ # set until the threshold is decided.
+ # Otherwise, tests will be unreliable.
+ filter_by_time = [[
"created_at", ">=",
time.strftime(
"%Y-%m-%dT%H:%M:%SZ",
@@ -207,7 +211,7 @@ class PollClient(threading.Thread):
items = self.api.logs().list(
order="id desc",
limit=1,
- filters=f+self._skip_old_events).execute()
+ filters=f+filter_by_time).execute()
if items["items"]:
self._skip_old_events = [
["id", ">", str(items["items"][0]["id"])]]
@@ -215,6 +219,11 @@ class PollClient(threading.Thread):
"items": [],
"items_available": 0,
}
+ else:
+ # No recent events. We can keep using
+ # the same timestamp threshold until
+ # we receive our first new event.
+ self._skip_old_events = filter_by_time
else:
# In this case, either we know the most
# recent matching ID, or we know there
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list