[ARVADOS] updated: bfdf3d5b0ab2b2747321f3d5e2fc3e18f165fefd
Git user
git at public.curoverse.com
Thu Jun 16 08:18:38 EDT 2016
Summary of changes:
apps/workbench/app/models/container_work_unit.rb | 14 +-
...rver.sh => common-test-rails-server-package.sh} | 17 ++-
.../test-package-arvados-api-server.sh | 21 +--
.../test-package-arvados-sso-server.sh | 170 +--------------------
.../test-package-arvados-workbench.sh | 21 +--
build/rails-package-scripts/postinst.sh | 15 +-
build/rails-package-scripts/step2.sh | 50 ++++++
build/run-build-packages.sh | 1 +
build/run-library.sh | 3 +-
sdk/go/arvados/api_client_authorization.go | 12 ++
sdk/go/arvados/client.go | 3 +-
sdk/go/arvados/container.go | 54 +++++++
sdk/go/arvados/error.go | 43 ++++++
sdk/go/dispatch/dispatch.go | 62 +++-----
sdk/python/arvados/commands/ws.py | 4 +
services/api/lib/eventbus.rb | 59 ++++---
.../crunch-dispatch-local/crunch-dispatch-local.go | 7 +-
.../crunch-dispatch-local_test.go | 21 +--
.../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 21 +--
.../crunch-dispatch-slurm_test.go | 35 ++---
services/crunch-run/crunchrun.go | 117 +++++---------
services/crunch-run/crunchrun_test.go | 158 +++++++++----------
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 10 +-
tools/arvbox/lib/arvbox/docker/Dockerfile.dev | 4 +-
24 files changed, 432 insertions(+), 490 deletions(-)
copy build/package-testing/{test-package-arvados-api-server.sh => common-test-rails-server-package.sh} (50%)
mode change 100755 => 120000 build/package-testing/test-package-arvados-api-server.sh
mode change 100755 => 120000 build/package-testing/test-package-arvados-sso-server.sh
mode change 100755 => 120000 build/package-testing/test-package-arvados-workbench.sh
create mode 100644 sdk/go/arvados/api_client_authorization.go
create mode 100644 sdk/go/arvados/container.go
create mode 100644 sdk/go/arvados/error.go
via bfdf3d5b0ab2b2747321f3d5e2fc3e18f165fefd (commit)
via e7d49ab46462902a98d812b69d7257d837f85e90 (commit)
via f00c2849c5cdbe179d61bcaa1374d355844c2fae (commit)
via e649689d1803837756ca8df0520b3fcb958d5939 (commit)
via aca461985963f60c185a02c53377d75eebf26266 (commit)
via e47a01ee19ee44b8004bab7ed7eec5bbf72f175e (commit)
via 3e307cf7261097e28701853cd89607234b7703ed (commit)
via 51eeec2a3ca1ece1362919c2a3d36d872ef6a065 (commit)
via 2dc11b82dd03fce85be2784a8430f91d53275d2e (commit)
via ff30b2754f2517fff513f766398ec04eac14c11c (commit)
via 36288f952d89249e7b52c714b0df0e4d0a4b0305 (commit)
via 83fed933f8d4d6000613024caec7d62dd7651209 (commit)
via e1db90809fe1eb94b0021e741af428fde3321c73 (commit)
via 0040468b872f7a888ed08be15538e314ee10a1c9 (commit)
via 19ad5dbdf1dc18d46f7fad9ca30b69126b224c96 (commit)
via 424181391748ec018b6157574dd65e5306d19f5d (commit)
via 2cd1c3ed705e639fb9e4ef067a32b278a6d3d4ee (commit)
via 0ac69cee6889be8337d147a75829596f19075fa5 (commit)
via f32e1aadda3cc2cb89ee341e24cc312f42d37505 (commit)
via a340b9c191733087722cd4203bf0b6b76f60cbec (commit)
via 3f3b57c67af8967d466cf69b4c8e41885eee13c8 (commit)
via 2ce42bc1b881972753b77d4e3f4de8355d947063 (commit)
via 65721c02e81f29cb8e40aab4b3d35bebc4f23cc6 (commit)
via b0e9a800435e6231317e5123c9b6a1b5b6397a5e (commit)
from cbd67fc6ba667bc27ca7e885145a6e34e5596f37 (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 bfdf3d5b0ab2b2747321f3d5e2fc3e18f165fefd
Author: radhika <radhika at curoverse.com>
Date: Thu Jun 16 08:17:46 2016 -0400
9372: variable names and comments.
diff --git a/apps/workbench/app/models/container_work_unit.rb b/apps/workbench/app/models/container_work_unit.rb
index d902995..ba2776b 100644
--- a/apps/workbench/app/models/container_work_unit.rb
+++ b/apps/workbench/app/models/container_work_unit.rb
@@ -1,12 +1,12 @@
class ContainerWorkUnit < ProxyWorkUnit
- attr_accessor :related
+ attr_accessor :container
def initialize proxied, label
super
if @proxied.is_a?(ContainerRequest)
container_uuid = get(:container_uuid)
if container_uuid
- @related = Container.where(uuid: container_uuid).first rescue nil
+ @container = Container.where(uuid: container_uuid).first
end
end
end
@@ -17,6 +17,8 @@ class ContainerWorkUnit < ProxyWorkUnit
items = []
if @proxied.is_a?(Container)
+ # If @proxied is a container, get all containter_requests where this is
+ # requesting_container_uuid and containers for their container_uuids
crs = {}
reqs = ContainerRequest.where(requesting_container_uuid: uuid).results
reqs.each { |cr| crs[cr.container_uuid] = cr.name }
@@ -28,6 +30,8 @@ class ContainerWorkUnit < ProxyWorkUnit
self.my_children = items
else
+ # Else for a container_request, get all container_requests whose
+ # requesting_container_uuid is this container_request's container_uuid.
container_uuid = get(:container_uuid)
if container_uuid
reqs = ContainerRequest.where(requesting_container_uuid: container_uuid).results
@@ -58,8 +62,8 @@ class ContainerWorkUnit < ProxyWorkUnit
get(:container_uuid)
end
- # For the following properties, use value from the @related container if exists
- # This applies to a ContainerRequest in Committed or Final state with container_uuid
+ # For the following properties, use value from the @container if exists
+ # This applies to a ContainerRequest with container_uuid
def started_at
t = get_combined(:started_at)
@@ -133,6 +137,6 @@ class ContainerWorkUnit < ProxyWorkUnit
protected
def get_combined key
- get(key, @related) || get(key, @proxied)
+ get(key, @container) || get(key, @proxied)
end
end
commit e7d49ab46462902a98d812b69d7257d837f85e90
Merge: cbd67fc f00c284
Author: radhika <radhika at curoverse.com>
Date: Wed Jun 15 13:39:52 2016 -0400
Merge branch 'master' into 9372-container-display
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list