[ARVADOS] updated: 4d95f6cc422bc4dea97da79bbfbb2e7809ee20fc
Git user
git at public.curoverse.com
Wed Jun 8 10:32:17 EDT 2016
Summary of changes:
apps/workbench/app/models/proxy_work_unit.rb | 10 +-
apps/workbench/app/models/work_unit.rb | 4 -
.../app/views/work_unit/_show_child.html.erb | 2 +-
apps/workbench/test/unit/work_unit_test.rb | 4 +-
sdk/cli/bin/arv | 45 ++-
sdk/cwl/arvados_cwl/__init__.py | 58 ++-
sdk/go/dispatch/dispatch.go | 253 +++++++++++++
services/api/test/fixtures/container_requests.yml | 60 ++-
services/api/test/fixtures/containers.yml | 84 ++++-
.../crunch-dispatch-local/crunch-dispatch-local.go | 266 +++++---------
.../crunch-dispatch-local_test.go | 112 ++++--
.../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 409 +++++++--------------
.../crunch-dispatch-slurm_test.go | 186 ++++++----
.../crunch-dispatch-slurm/crunch-finish-slurm.sh | 20 -
services/crunch-dispatch-slurm/squeue.go | 114 ++++++
services/crunch-run/crunchrun.go | 271 +++++++++-----
services/crunch-run/crunchrun_test.go | 46 ++-
services/crunch-run/logging_test.go | 6 +-
services/keepstore/keepstore.go | 6 +-
19 files changed, 1218 insertions(+), 738 deletions(-)
create mode 100644 sdk/go/dispatch/dispatch.go
delete mode 100755 services/crunch-dispatch-slurm/crunch-finish-slurm.sh
create mode 100644 services/crunch-dispatch-slurm/squeue.go
via 4d95f6cc422bc4dea97da79bbfbb2e7809ee20fc (commit)
via 2efdb0e205abe63c5ca777fc4dacca65192e5dd3 (commit)
via 548e0c54db524cb7317850d4dfd8f3ee0b93cdb0 (commit)
via a95f899d7ac84f29b3d019aa410d265bb40833e5 (commit)
via 252a5f7f290567f7cbcc9897a879c0a7ebe64e90 (commit)
via 8630c5472c508b37c26751768c568e429652bb15 (commit)
via 1f18112293b02114b4dc5b279f18b15e4b9a6655 (commit)
via d10c79192b333191796d949841ec792e61a6006c (commit)
via b7dbb80a0745d5daec4b3a04b6c9e9e19732cb3e (commit)
via b7db50d724c258c89da5b5d7b005de2f04d92653 (commit)
via 6d940c5e6940a1dca97989c47e67c33d20a4d050 (commit)
via b0e7987af4ac6ae6ea3250e9dafa4ecf58544770 (commit)
via 18db9a81749b63725ff2a5a13a11442cdd054ad9 (commit)
via e168c00d6dd4f6524089998debede1abe811c892 (commit)
via 55febaa6856eb2d77657edd685aaae78bba0ec82 (commit)
via 139200027a3192260b5ea7c2d0c93a8eb5f8eb7e (commit)
via c405873d87e0764acf3855c559c85fa6d7a63cfb (commit)
via d45be86b354adec485504bfc09f41e0e22241f34 (commit)
via ebb21c7daa50d4101b34647b0e961e4f470a5b0b (commit)
via a903ecabc5b8d1f33c0f1a9338525c147c75b35a (commit)
via 26d4cf61346b77ef06556f15b539d532a076d7fb (commit)
via 6db539443f98f6f56935f55aa611f5ed29622e19 (commit)
via e7217857f942d11bdca90c58cf22f8f18c9d29df (commit)
via 6b2f232c3d73a023d64112c609a28c8ff9cc27de (commit)
via 94d3f4ba358ac5fef765fb7574d6823ff8c335aa (commit)
via bb10b7777ed6db229fbb35e6a829bec4e8efcd23 (commit)
via 5cf8c18e735bb15da3f131e7ae57bb4b222bb4ed (commit)
via d77c4cc58d393c48ce46b987f6eada7c7cc381c6 (commit)
via e6cb66913899a35cda5a5a8df26869cb29c0ebcd (commit)
via e62729494da8bcd9fc05a3e4b0b853205892bfeb (commit)
via 3ae9a789410e93eeb31ca5670c17a6d03d77f608 (commit)
via 3a3910fdc8a5003c182f68e3423c96327a136175 (commit)
via 4153cb6cfad920ed0b1a4b818d3bcc8de492d134 (commit)
via 7afa73aff577d3c2c066c21586a44a94c8731710 (commit)
via fe3f19bb8f0a684de9c5a7d1f7c619943d0daca0 (commit)
via ae3a047bed172be701e3d2aa2d566e9800552d85 (commit)
via 212fa4898c594211217444b20ef629157813bc4a (commit)
via f6400fca6dc60055b613b0e3dc3c8422b7af6391 (commit)
from abf6347cc1d56bc448e993249c9d6359ba60c606 (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 4d95f6cc422bc4dea97da79bbfbb2e7809ee20fc
Author: radhika <radhika at curoverse.com>
Date: Wed Jun 8 10:31:45 2016 -0400
8650: test and fixture update
diff --git a/apps/workbench/test/unit/work_unit_test.rb b/apps/workbench/test/unit/work_unit_test.rb
index f00644e..db38b8e 100644
--- a/apps/workbench/test/unit/work_unit_test.rb
+++ b/apps/workbench/test/unit/work_unit_test.rb
@@ -10,10 +10,10 @@ class WorkUnitTest < ActiveSupport::TestCase
[PipelineInstance, 'pipeline_in_running_state', nil, 1, "Running", nil, 0.0],
[PipelineInstance, 'has_component_with_completed_jobs', nil, 3, "Complete", true, 1.0],
[PipelineInstance, 'pipeline_with_tagged_collection_input', "pwu", 1, "Ready", nil, 0.0],
- [Container, 'requester', 'cwu', 3, "Complete", true, 1.0],
+ [Container, 'requester', 'cwu', 1, "Complete", true, 1.0],
].each do |type, fixture, label, num_children, state, success, progress|
test "children of #{fixture}" do
- use_token 'admin'
+ use_token 'active'
obj = find_fixture(type, fixture)
wu = obj.work_unit(label)
diff --git a/services/api/test/fixtures/container_requests.yml b/services/api/test/fixtures/container_requests.yml
index 1e474bb..371db4a 100644
--- a/services/api/test/fixtures/container_requests.yml
+++ b/services/api/test/fixtures/container_requests.yml
@@ -13,7 +13,38 @@ queued:
output_path: test
command: ["echo", "hello"]
container_uuid: zzzzz-dz642-queuedcontainer
- requesting_container_uuid: zzzzz-dz642-requestingcntnr
+
+running:
+ uuid: zzzzz-xvhdp-cr4runningcntnr
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ name: running
+ state: Committed
+ priority: 1
+ created_at: 2016-01-11 11:11:11.111111111 Z
+ updated_at: 2016-01-11 11:11:11.111111111 Z
+ modified_at: 2016-01-11 11:11:11.111111111 Z
+ modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ container_image: test
+ cwd: test
+ output_path: test
+ command: ["echo", "hello"]
+ container_uuid: zzzzz-dz642-runningcontainr
+
+running-older:
+ uuid: zzzzz-xvhdp-cr4runningcntn2
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ name: running
+ state: Committed
+ priority: 1
+ created_at: 2016-01-11 11:11:11.111111111 Z
+ updated_at: 2016-01-11 11:11:11.111111111 Z
+ modified_at: 2016-01-12 11:11:11.111111111 Z
+ modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ container_image: test
+ cwd: test
+ output_path: test
+ command: ["echo", "hello"]
+ container_uuid: zzzzz-dz642-runningcontain2
completed:
uuid: zzzzz-xvhdp-cr4completedctr
@@ -30,13 +61,28 @@ completed:
output_path: test
command: ["echo", "hello"]
container_uuid: zzzzz-dz642-compltcontainer
- requesting_container_uuid: zzzzz-dz642-requestingcntnr
-running:
- uuid: zzzzz-xvhdp-cr4runningcntnr
+completed-older:
+ uuid: zzzzz-xvhdp-cr4completedcr2
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- name: running
- state: Committed
+ name: completed
+ state: Final
+ priority: 1
+ created_at: 2016-01-11 11:11:11.111111111 Z
+ updated_at: 2016-01-11 11:11:11.111111111 Z
+ modified_at: 2016-01-11 11:11:11.111111111 Z
+ modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ container_image: test
+ cwd: test
+ output_path: test
+ command: ["echo", "hello"]
+ container_uuid: zzzzz-dz642-compltcontainr2
+
+cr_for_requester:
+ uuid: zzzzz-xvhdp-cr4requestercnt
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ name: requester_cr
+ state: Final
priority: 1
created_at: 2016-01-11 11:11:11.111111111 Z
updated_at: 2016-01-11 11:11:11.111111111 Z
@@ -46,5 +92,5 @@ running:
cwd: test
output_path: test
command: ["echo", "hello"]
- container_uuid: zzzzz-dz642-requestingcntnr
+ container_uuid: zzzzz-dz642-requestercntnr1
requesting_container_uuid: zzzzz-dz642-requestingcntnr
diff --git a/services/api/test/fixtures/containers.yml b/services/api/test/fixtures/containers.yml
index 4c8c8c1..b354993 100644
--- a/services/api/test/fixtures/containers.yml
+++ b/services/api/test/fixtures/containers.yml
@@ -1,6 +1,6 @@
queued:
uuid: zzzzz-dz642-queuedcontainer
- owner_uuid: zzzzz-tpzed-000000000000000
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
state: Queued
priority: 1
created_at: 2016-01-11 11:11:11.111111111 Z
@@ -14,13 +14,65 @@ queued:
ram: 12000000000
vcpus: 4
+running:
+ uuid: zzzzz-dz642-runningcontainr
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ state: Running
+ priority: 1
+ created_at: 2016-01-11 11:11:11.111111111 Z
+ updated_at: 2016-01-11 11:11:11.111111111 Z
+ started_at: 2016-01-11 11:11:11.111111111 Z
+ container_image: test
+ cwd: test
+ output: test
+ output_path: test
+ command: ["echo", "hello"]
+ runtime_constraints:
+ ram: 12000000000
+ vcpus: 4
+
+running-older:
+ uuid: zzzzz-dz642-runningcontain2
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ state: Running
+ priority: 1
+ created_at: 2016-01-11 11:11:11.111111111 Z
+ updated_at: 2016-01-11 11:11:11.111111111 Z
+ started_at: 2016-01-12 11:11:11.111111111 Z
+ container_image: test
+ cwd: test
+ output: test
+ output_path: test
+ command: ["echo", "hello"]
+ runtime_constraints:
+ ram: 12000000000
+ vcpus: 4
+
+locked:
+ uuid: zzzzz-dz642-lockedcontainer
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ state: Locked
+ priority: 2
+ created_at: 2016-01-01 11:11:11.111111111 Z
+ updated_at: 2016-01-01 11:11:11.111111111 Z
+ container_image: test
+ cwd: test
+ output: test
+ output_path: test
+ command: ["echo", "hello"]
+ runtime_constraints:
+ ram: 12000000000
+ vcpus: 4
+
completed:
uuid: zzzzz-dz642-compltcontainer
- owner_uuid: zzzzz-tpzed-000000000000000
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
state: Complete
priority: 1
created_at: 2016-01-11 11:11:11.111111111 Z
updated_at: 2016-01-11 11:11:11.111111111 Z
+ started_at: 2016-01-11 11:11:11.111111111 Z
+ finished_at: 2016-01-12 11:12:13.111111111 Z
container_image: test
cwd: test
output: test
@@ -30,13 +82,15 @@ completed:
ram: 12000000000
vcpus: 4
-running:
- uuid: zzzzz-dz642-runningcontainr
- owner_uuid: zzzzz-tpzed-000000000000000
- state: Running
+completed_older:
+ uuid: zzzzz-dz642-compltcontainr2
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ state: Complete
priority: 1
created_at: 2016-01-11 11:11:11.111111111 Z
updated_at: 2016-01-11 11:11:11.111111111 Z
+ started_at: 2016-01-13 11:11:11.111111111 Z
+ finished_at: 2016-01-14 11:12:13.111111111 Z
container_image: test
cwd: test
output: test
@@ -48,7 +102,23 @@ running:
requester:
uuid: zzzzz-dz642-requestingcntnr
- owner_uuid: zzzzz-tpzed-000000000000000
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ state: Complete
+ priority: 1
+ created_at: 2016-01-11 11:11:11.111111111 Z
+ updated_at: 2016-01-11 11:11:11.111111111 Z
+ container_image: test
+ cwd: test
+ output: test
+ output_path: test
+ command: ["echo", "hello"]
+ runtime_constraints:
+ ram: 12000000000
+ vcpus: 4
+
+requester_container:
+ uuid: zzzzz-dz642-requestercntnr1
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
state: Complete
priority: 1
created_at: 2016-01-11 11:11:11.111111111 Z
commit 2efdb0e205abe63c5ca777fc4dacca65192e5dd3
Merge: abf6347 548e0c5
Author: radhika <radhika at curoverse.com>
Date: Wed Jun 8 10:25:36 2016 -0400
Merge branch 'master' into 8650-container-work-unit
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list