[ARVADOS] updated: e378ed1d86cbab36f0c7093e4dc189f6184834bf
Git user
git at public.curoverse.com
Thu Sep 8 11:02:48 EDT 2016
Summary of changes:
.../app/assets/javascripts/pipeline_instances.js | 20 ---
.../app/assets/javascripts/work_unit_log.js | 68 +++++++
apps/workbench/app/models/container_work_unit.rb | 21 +--
apps/workbench/app/models/job.rb | 3 +-
apps/workbench/app/models/proxy_work_unit.rb | 9 +
.../app/views/work_units/_show_child.html.erb | 4 +-
.../app/views/work_units/_show_component.html.erb | 64 +++----
.../test/helpers/fake_websocket_helper.rb | 18 ++
.../test/integration/application_layout_test.rb | 75 --------
.../test/integration/container_requests_test.rb | 4 +-
apps/workbench/test/integration/websockets_test.rb | 200 +++++++++------------
apps/workbench/test/integration/work_units_test.rb | 150 ++++++++++++++++
apps/workbench/test/integration_helper.rb | 23 ++-
apps/workbench/test/support/fake_websocket.js | 15 ++
apps/workbench/test/test_helper.rb | 10 +-
apps/workbench/test/unit/work_unit_test.rb | 14 ++
build/README | 30 ++++
build/package-build-dockerfiles/centos6/Dockerfile | 3 +-
build/package-test-dockerfiles/centos6/Dockerfile | 3 +-
build/run-build-packages.sh | 38 ++--
doc/_config.yml | 2 +-
doc/user/cwl/cwl-style.html.textile.liquid | 168 +++++++++++++++++
sdk/cwl/arvados_cwl/__init__.py | 3 +-
sdk/cwl/arvados_cwl/fsaccess.py | 4 +-
sdk/cwl/setup.py | 4 +-
.../api/app/controllers/application_controller.rb | 8 +-
.../arvados/v1/container_requests_controller.rb | 1 +
.../app/controllers/arvados/v1/jobs_controller.rb | 166 +----------------
services/api/app/models/arvados_model.rb | 85 ++++-----
services/api/app/models/container.rb | 14 ++
services/api/app/models/job.rb | 177 +++++++++++++++++-
services/api/app/models/log.rb | 18 ++
services/api/config/application.default.yml | 6 +
services/api/config/initializers/lograge.rb | 4 +-
...160901210110_repair_script_parameters_digest.rb | 17 ++
services/api/db/structure.sql | 4 +-
services/api/lib/eventbus.rb | 2 +-
services/api/lib/simulate_job_log.rb | 3 +
services/api/test/factories/api_client.rb | 2 +-
.../api/test/factories/api_client_authorization.rb | 2 +-
services/api/test/factories/user.rb | 10 +-
services/api/test/fixtures/container_requests.yml | 21 ++-
services/api/test/fixtures/containers.yml | 19 +-
services/api/test/fixtures/logs.yml | 4 +-
.../arvados/v1/job_reuse_controller_test.rb | 2 +-
services/api/test/integration/permissions_test.rb | 10 +-
services/api/test/integration/websocket_test.rb | 60 +++----
services/api/test/test_helper.rb | 1 +
services/api/test/unit/container_request_test.rb | 6 +
services/api/test/unit/job_test.rb | 6 +
services/api/test/unit/log_test.rb | 3 +-
services/api/test/unit/permission_test.rb | 23 +++
52 files changed, 1054 insertions(+), 573 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/work_unit_log.js
create mode 100644 apps/workbench/test/helpers/fake_websocket_helper.rb
create mode 100644 apps/workbench/test/support/fake_websocket.js
create mode 100644 build/README
create mode 100644 doc/user/cwl/cwl-style.html.textile.liquid
create mode 100644 services/api/db/migrate/20160901210110_repair_script_parameters_digest.rb
via e378ed1d86cbab36f0c7093e4dc189f6184834bf (commit)
via ea8dcefcfdfea0e90ba5c45e2e692f5e59088e6b (commit)
via 19aca702ed17c7c89a5ba7d828a77105131e54db (commit)
via 96185e5347e2303d0b5215ed61bd59c0f2bc84a1 (commit)
via 3f06710d50c75c9d0c990fe05f9c1be017c55f87 (commit)
via b4a79e9c1de2e53acee8850e6d1ef3866aff0d3a (commit)
via 64d7948de09c56afdc2d7b1d9fa002a655eedf65 (commit)
via 3db1a8bbb9f14799e0aabd12cff3c980c7da0167 (commit)
via f9e3477a6a6b39ea32a0299d95971b03ebc3d50c (commit)
via 2d721e0fe63f0cf127f44a45c75201c696a8cd9e (commit)
via 5aaaed7d7b1287c0133dd66c9492d6df62790288 (commit)
via 183d42044fbb540b7db6a093d25cca9808bfb369 (commit)
via b046d1f162990361418a8e926aead5b307402a42 (commit)
via bf6dfd5785f6767d2700dadfebb8591a8595d5f3 (commit)
via 96cc8940e7926453f4728c5aec1374e7b99db201 (commit)
via 27680aebaeff734ce65f7385b0e150a39dc1653b (commit)
via dcb6eaa5012bf1eea607c61209bee18723769c24 (commit)
via 7af78c9694656d42c2bbb090e5aac62e7b3a0362 (commit)
via af0ece600054c97aae9661ed06731af47873a7ff (commit)
via 16e1811a346d7ed20999a6f6420c7a57937dbd09 (commit)
via d5ebfb1d35d2458742c545af4ee16c9f14de08bb (commit)
via ef439ae62e3b73ee81b428b64e62fe1fe13b32d0 (commit)
via b9e29babf66aa33ea2188f80d517b11e5755e83a (commit)
via 8f5ef3058658c046cd25e4fff7b2f0ffafb79b77 (commit)
via dfb8a488acce58b7dec6c3873964dc484f189b20 (commit)
via 97bb0917adfeb4db73c4c27cac8e337828c34015 (commit)
via 62481e29ad90ca0014574bb0f863b27cd93441a8 (commit)
via 9e1586545c360ccf8a0a24d2715b4c2250c8cda0 (commit)
via 2bf2f1905ac5d4c655e6f835b9143625e91a7fb6 (commit)
via 9bd3b2729a61f62ddbab10ac65fd9f7de837a10d (commit)
via 4cb02985f6d0b8aa436ed86506eb9b4d9d7d1c36 (commit)
via 29161e1c68253e4ba4cd59a4b648482e70e24ae9 (commit)
via 59448e46212f50fc317da51d93309d4e1642b55e (commit)
via dcf7f7d492830f11b58e691d127849c6781c8244 (commit)
via 3090a8d0b4020b291bf34958680e3cf4cd0b8c21 (commit)
via 730eb182b2160040a902feb09276b75a3f9c137c (commit)
via 415cb3b63e8cfafd4c6b92a8971a0cff74097337 (commit)
via 2cc397021b57dc43449730f4d13ac99d4e6be41d (commit)
via a1c3389d7fe54a7311609e7f74b5a9b3ea825c94 (commit)
via 694836fc68fbe6414d5248b48889ea3be1c33b75 (commit)
via 203cf7998836c7a00cfad2eeaf59b59f07d8e3ed (commit)
via 262a16e15c0dcfa9245e9c8fd88d383f54f51471 (commit)
via 661399e4fd26be1a932d94d0b2c419cd3a33a4f1 (commit)
via 9fd1f52e97c96f9a0a0fc76b37520828f0d9221d (commit)
via 5497c52dae7a3832e75d8e414492d48df1192ddc (commit)
via 3d53281b9e3ba0840e5e3eaeb0371e0f50a345ad (commit)
via 61ee10791b2b1f3724e6a8736c93161a625b5246 (commit)
via 87cb6b04df6f71d5bce9b0b3c1257e0b5082668d (commit)
via 2bc21107e3fa6c4ecea7efb22e4dfc7e30b3233d (commit)
via 71ec472aa11b47a58beb3b050fee38244674869e (commit)
via 579195def22d6b02f7484933d6db065bc33088d9 (commit)
via 08224a6abb60ff61f3967abc9665f50f9157791b (commit)
via 08262a4e18c0b3b65946878058e9546823b82535 (commit)
via 95e6adc8ac2c9449aba651ef0d932cd7d27aea5e (commit)
from 3ea8a43af615fc16cb8884a7bda78093c449542c (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 e378ed1d86cbab36f0c7093e4dc189f6184834bf
Merge: 3ea8a43 ea8dcef
Author: radhika <radhika at curoverse.com>
Date: Thu Sep 8 11:02:39 2016 -0400
Merge branch 'master' into 9898-container-lock-api
Conflicts:
services/api/app/models/container.rb
diff --cc services/api/app/models/container.rb
index a57fbf0,1e645e4..ae759de
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@@ -76,15 -76,20 +76,29 @@@ class Container < ArvadosMode
end
end
+ def lock
+ with_lock do
+ if self.state == Queued
+ self.state = Locked
+ self.save!
+ end
+ end
+ end
+
+ def self.readable_by(*users_list)
+ if users_list.select { |u| u.is_admin }.any?
+ return self
+ end
+ user_uuids = users_list.map { |u| u.uuid }
+ uuid_list = user_uuids + users_list.flat_map { |u| u.groups_i_can(:read) }
+ uuid_list.uniq!
+ permitted = "(SELECT head_uuid FROM links WHERE link_class='permission' AND tail_uuid IN (:uuids))"
+ joins(:container_requests).
+ where("container_requests.uuid IN #{permitted} OR "+
+ "container_requests.owner_uuid IN (:uuids)",
+ uuids: uuid_list)
+ end
+
protected
def fill_field_defaults
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list