[ARVADOS] updated: 1.2.0-237-g559679a06
Git user
git at public.curoverse.com
Thu Oct 18 12:21:30 EDT 2018
Summary of changes:
apps/workbench/app/views/layouts/body.html.erb | 4 +
apps/workbench/config/application.default.yml | 6 +
build/go-python-package-scripts/postinst | 4 +-
build/go-python-package-scripts/prerm | 4 +-
.../.gitignore | 0
.../Makefile | 10 +-
build/package-test-dockerfiles/README | 7 +
build/package-test-dockerfiles/centos7/Dockerfile | 6 +-
build/package-test-dockerfiles/debian8/Dockerfile | 11 +-
.../package-test-dockerfiles/debian9/D39DC0E3.asc | 692 ---------------------
build/package-test-dockerfiles/debian9/Dockerfile | 12 +-
.../package-test-dockerfiles/ubuntu1404/Dockerfile | 11 +-
.../package-test-dockerfiles/ubuntu1604/Dockerfile | 11 +-
.../package-test-dockerfiles/ubuntu1804/Dockerfile | 9 +-
build/run-build-packages-one-target.sh | 1 +
build/run-build-packages.sh | 10 +-
build/run-tests.sh | 2 +
doc/_includes/_create_superuser_token.liquid | 14 +
doc/_includes/_install_compute_docker.liquid | 2 +-
doc/admin/health-checks.html.textile.liquid | 21 +-
doc/admin/metrics.html.textile.liquid | 27 +
.../install-dispatch.html.textile.liquid | 9 +-
.../install-keep-balance.html.textile.liquid | 7 +-
doc/install/install-keepproxy.html.textile.liquid | 2 +-
doc/install/install-keepstore.html.textile.liquid | 8 +-
.../install-shell-server.html.textile.liquid | 2 +-
sdk/go/arvados/config.go | 3 +
sdk/go/arvadostest/fixtures.go | 1 +
sdk/go/auth/auth.go | 6 +-
sdk/go/auth/handlers.go | 50 ++
sdk/go/auth/handlers_test.go | 79 +++
sdk/go/health/aggregator.go | 2 +-
sdk/go/health/aggregator_test.go | 2 +
sdk/go/httpserver/metrics.go | 16 +-
.../api/app/controllers/application_controller.rb | 5 +-
.../arvados/v1/collections_controller.rb | 14 +-
.../arvados/v1/containers_controller.rb | 7 +-
services/api/app/models/arvados_model.rb | 24 +-
services/api/app/models/collection.rb | 131 +++-
services/api/app/models/container.rb | 10 +-
services/api/app/models/container_request.rb | 6 +-
services/api/app/models/link.rb | 6 +-
services/api/config/application.default.yml | 11 +
...180913175443_add_version_info_to_collections.rb | 14 +
...5335_set_current_version_uuid_on_collections.rb | 13 +
...001158_recreate_collection_unique_name_index.rb | 27 +
...01175023_add_preserve_version_to_collections.rb | 9 +
...ent_version_uuid_to_collection_search_index.rb} | 8 +-
services/api/db/structure.sql | 31 +-
services/api/test/fixtures/collections.yml | 112 +++-
.../arvados/v1/collections_controller_test.rb | 59 ++
.../arvados/v1/schema_controller_test.rb | 2 +-
services/api/test/unit/collection_test.rb | 308 ++++++++-
services/api/test/unit/link_test.rb | 5 +
services/arv-git-httpd/auth_handler.go | 2 +-
.../dockercleaner/arvados-docker-cleaner.service | 2 +-
services/keep-balance/balance.go | 74 ++-
services/keep-balance/balance_run_test.go | 76 ++-
services/keep-balance/block_state.go | 2 +
services/keep-balance/integration_test.go | 14 +-
services/keep-balance/main.go | 116 +---
services/keep-balance/metrics.go | 118 ++++
services/keep-balance/server.go | 197 ++++++
services/keep-balance/time_me.go | 18 -
services/keep-balance/usage.go | 2 +
services/keep-web/handler.go | 4 +-
services/keep-web/handler_test.go | 34 +
services/keep-web/server.go | 2 +-
services/keep-web/server_test.go | 14 +
services/keepstore/config.go | 3 +-
services/keepstore/handlers.go | 4 +-
services/keepstore/mounts_test.go | 7 +-
services/nodemanager/MANIFEST.in | 3 +-
.../arvados-node-manager.service} | 11 +-
services/nodemanager/setup.py | 2 +-
75 files changed, 1577 insertions(+), 981 deletions(-)
copy build/{package-build-dockerfiles => package-test-dockerfiles}/.gitignore (100%)
copy build/{package-build-dockerfiles => package-test-dockerfiles}/Makefile (72%)
create mode 100644 build/package-test-dockerfiles/README
delete mode 100644 build/package-test-dockerfiles/debian9/D39DC0E3.asc
create mode 100644 doc/_includes/_create_superuser_token.liquid
create mode 100644 sdk/go/auth/handlers.go
create mode 100644 sdk/go/auth/handlers_test.go
create mode 100644 services/api/db/migrate/20180913175443_add_version_info_to_collections.rb
create mode 100644 services/api/db/migrate/20180915155335_set_current_version_uuid_on_collections.rb
create mode 100644 services/api/db/migrate/20180919001158_recreate_collection_unique_name_index.rb
create mode 100644 services/api/db/migrate/20181001175023_add_preserve_version_to_collections.rb
copy services/api/db/migrate/{20150423145759_no_filenames_in_collection_search_index.rb => 20181004131141_add_current_version_uuid_to_collection_search_index.rb} (66%)
create mode 100644 services/keep-balance/metrics.go
create mode 100644 services/keep-balance/server.go
delete mode 100644 services/keep-balance/time_me.go
copy services/{health/arvados-health.service => nodemanager/arvados-node-manager.service} (62%)
via 559679a061470337d5555a3de519a0e86ad4cdd2 (commit)
via 89be4b30feccc3680ca77339711b29367754dc05 (commit)
via 34c144c154aa39b8c492551e944fd4ff1949d135 (commit)
via eab1bd711a010468edfef42d1d59ad66523713aa (commit)
via 917cdcde33c5a4ab7075a1d844d6dbe2540ab05a (commit)
via c14562a9a2cc86e4b12c13e078e57fe3326a2619 (commit)
via bd2eed9c62ba1aea8ac92d11fd20dfb79a49ae3f (commit)
via bf4ab09eb832d2b3528dfeff3b4418ce471ec753 (commit)
via 4990a2cae3af4ecf8bbbc75e863da9e67cd47374 (commit)
via 095a65470bf2cf88a039175c44a1b59a2e20aeae (commit)
via b1bc9280834cc9f492f9a052dfcbf068988b4b55 (commit)
via a7f9e978a4e45440a965d94ff849f59508a5456a (commit)
via 0afa17181a2bd003a50ec5d1705533b84b02ad2c (commit)
via faeb978ad985f983ec8dc18292524e0bd7bbda03 (commit)
via c64cf92414315c09771770e5d079bc4ad8328f52 (commit)
via d6a21ab8a0c5a45bdcd7c0fbaa93f7096e56e831 (commit)
via d2fb3f8daccf2362ac5f5fb91eae0255674b0818 (commit)
via 6f81d7266a7db4d1be83e79e5bf2e5afc49b2e3c (commit)
via 10fcb91c287fb91d1c63eaebb9a477a098034dfb (commit)
via e45c5654ed1122792b177b9aa86b71c0e840f9f3 (commit)
via f29266f2fd9d2713f6b2666d13d4f706630b7215 (commit)
via 70459cdae1f4e92789a14c1fecb66f5954a5aa7f (commit)
via c4ec117c9f3ed7108d7079603407b5c5c64a8c1d (commit)
via fd7b63d5d85d23e410f9d6f0c0a697f65b755c47 (commit)
via 3e0605a8286fb11df9e8dba739aea496b1c18418 (commit)
via c38cb3f4595b5e97c23db899b4d7c9993f089c08 (commit)
via 7ad5d87a9e2d67224ed440c9320f1850cbaf6ae1 (commit)
via a57d9687340458cb4f7861faace44da0e5b0dda1 (commit)
via 063eb858429a7472c888261d0512fd960e92b7ae (commit)
via 2e50177344ad50dc5d6c599445c272e200636af8 (commit)
via 1f7a87ea4c342d16e0992872e2893cb6a2da92e9 (commit)
via 051ad2017b69ca8e438396b461525e485a896321 (commit)
via c5335b934aacebe7a3707c6a52abafe457a6f76d (commit)
via e7e011e1fce68c484724073acd588655a2a10875 (commit)
via a31587cba5c2c38e0fc4f91981baf8bf2605664c (commit)
via c8b76b1d730d68fe9cb89ec4a619ce2f5a515531 (commit)
via 7182964d1d475f77a4ae72424c06ebb447b7a14f (commit)
via 1499536dae11776694d8cd99747a1d8625903b26 (commit)
via e849fc92933403506bee7f9fa132289d9a5c2d1e (commit)
via a23722793aa13e0e8dd37aa91e16111dba452ba0 (commit)
via 0f11eb78e075445d1769b445ee12328bdb397781 (commit)
via 728b7ee1f1501e8bf5b5f9c4310d1fb5475ec79e (commit)
via 652e26feea271a3d86430cd494503ff96e11dc9f (commit)
via a18fe628853e2042bb104088dd586cb8f41adcef (commit)
via 762e0ab6ac28f783c5d0c9fdec438f13418f9ad6 (commit)
via 14cfc3a648e17b4e52fd8cc17c9250291e53afa7 (commit)
via f0a85e273056d0ad440084c11a37c73ce25fb4f6 (commit)
via 647511030800d228feb6955dfab9cb0a26cbfcfb (commit)
via fb61bedcbc49d54708410ed394da133440a9d78f (commit)
via be8fbfd594717232c4dc7c4d16cdf3bde1137ee0 (commit)
via be338ff6ecdfbc75e094b3e65134c9a841f3209c (commit)
via 737dcc58241a06e32615624877d3301b90574227 (commit)
via dbfe1d83ff4e77edc77a562022a999e9ba9e2e2b (commit)
via e37b9b6599f427520100aa262bcd65d6596bdbfd (commit)
from f2a3cbef366bd7ff4b5c8894dd04c3b08aea138f (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 559679a061470337d5555a3de519a0e86ad4cdd2
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Thu Oct 18 12:20:50 2018 -0400
14260: Sort runtime_auth_scopes
Container.for_current_token returns nil or a Container (not an active
record query).
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/services/api/app/controllers/arvados/v1/containers_controller.rb b/services/api/app/controllers/arvados/v1/containers_controller.rb
index 0403b8822..8542096ce 100644
--- a/services/api/app/controllers/arvados/v1/containers_controller.rb
+++ b/services/api/app/controllers/arvados/v1/containers_controller.rb
@@ -58,11 +58,10 @@ class Arvados::V1::ContainersController < ApplicationController
if Thread.current[:api_client_authorization].nil?
send_error("Not logged in", status: 401)
else
- c = Container.for_current_token
- if c.nil? or c.first.nil?
+ @object = Container.for_current_token
+ if @object.nil?
send_error("Token is not associated with a container.", status: 404)
else
- @object = c.first
show
end
end
@@ -70,7 +69,7 @@ class Arvados::V1::ContainersController < ApplicationController
def secret_mounts
c = Container.for_current_token
- if @object && c && @object.uuid == c.first.uuid
+ if @object && c && @object.uuid == c.uuid
send_json({"secret_mounts" => @object.secret_mounts})
else
send_error("Token is not associated with this container.", status: 403)
diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index 527881ba6..0d8453174 100644
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@ -286,7 +286,7 @@ class Container < ArvadosModel
log_reuse_info(candidates) { "after filtering on runtime_user_uuid #{attrs[:runtime_user_uuid].inspect}" }
candidates = candidates.where('runtime_auth_scopes = ? or (runtime_user_uuid is NULL and runtime_auth_scopes is NULL)',
- SafeJSON.dump(attrs[:runtime_auth_scopes]))
+ SafeJSON.dump(attrs[:runtime_auth_scopes].sort))
log_reuse_info(candidates) { "after filtering on runtime_auth_scopes #{attrs[:runtime_auth_scopes].inspect}" }
log_reuse_info { "checking for state=Complete with readable output and log..." }
@@ -393,14 +393,15 @@ class Container < ArvadosModel
end
def self.for_current_token
+ return if !current_api_client_authorization
_, _, _, container_uuid = Thread.current[:token].split('/')
if container_uuid.nil?
- Container.where(auth_uuid: current_api_client_authorization.uuid)
+ Container.where(auth_uuid: current_api_client_authorization.uuid).first
else
Container.where('auth_uuid=? or (uuid=? and runtime_token=?)',
current_api_client_authorization.uuid,
container_uuid,
- current_api_client_authorization.token)
+ current_api_client_authorization.token).first
end
end
@@ -603,6 +604,9 @@ class Container < ArvadosModel
if self.scheduling_parameters_changed?
self.scheduling_parameters = self.class.deep_sort_hash(self.scheduling_parameters)
end
+ if self.runtime_auth_scopes_changed?
+ self.runtime_auth_scopes = self.runtime_auth_scopes.sort
+ end
end
def update_secret_mounts_md5
diff --git a/services/api/app/models/container_request.rb b/services/api/app/models/container_request.rb
index 61b65b1ed..0c2ad0965 100644
--- a/services/api/app/models/container_request.rb
+++ b/services/api/app/models/container_request.rb
@@ -392,10 +392,6 @@ class ContainerRequest < ArvadosModel
def get_requesting_container
return self.requesting_container_uuid if !self.requesting_container_uuid.nil?
- return if !current_api_client_authorization
- c = Container.for_current_token
- if !c.nil?
- c.select([:uuid, :priority]).first
- end
+ Container.for_current_token
end
end
diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index b9db1add0..85fa9e736 100644
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -3189,6 +3189,12 @@ INSERT INTO schema_migrations (version) VALUES ('20180915155335');
INSERT INTO schema_migrations (version) VALUES ('20180917205609');
+INSERT INTO schema_migrations (version) VALUES ('20180919001158');
+
+INSERT INTO schema_migrations (version) VALUES ('20181001175023');
+
+INSERT INTO schema_migrations (version) VALUES ('20181004131141');
+
INSERT INTO schema_migrations (version) VALUES ('20181005192222');
INSERT INTO schema_migrations (version) VALUES ('20181011184200');
commit 89be4b30feccc3680ca77339711b29367754dc05
Merge: f2a3cbef3 34c144c15
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Thu Oct 18 11:58:57 2018 -0400
Merge branch 'master' into 14260-runtime-token
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --cc services/api/db/structure.sql
index 636306f97,5b579bd39..b9db1add0
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -3173,9 -3179,14 +3183,18 @@@ INSERT INTO schema_migrations (version
INSERT INTO schema_migrations (version) VALUES ('20180904110712');
+ INSERT INTO schema_migrations (version) VALUES ('20180913175443');
+
+ INSERT INTO schema_migrations (version) VALUES ('20180915155335');
+
INSERT INTO schema_migrations (version) VALUES ('20180917205609');
+INSERT INTO schema_migrations (version) VALUES ('20181005192222');
+
+INSERT INTO schema_migrations (version) VALUES ('20181011184200');
+
+ INSERT INTO schema_migrations (version) VALUES ('20180919001158');
+
+ INSERT INTO schema_migrations (version) VALUES ('20181001175023');
+
+ INSERT INTO schema_migrations (version) VALUES ('20181004131141');
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list