[ARVADOS] updated: 9e2357191ca21631bcb6d8cf7a640d456a1a6cfa
git at public.curoverse.com
git at public.curoverse.com
Wed Sep 17 09:16:30 EDT 2014
Summary of changes:
apps/workbench/app/models/collection.rb | 4 +
apps/workbench/app/models/job.rb | 9 +-
apps/workbench/app/models/pipeline_instance.rb | 6 +-
apps/workbench/app/models/pipeline_template.rb | 4 +
.../application/_name_and_description.html.erb | 12 ++
apps/workbench/app/views/application/show.html.erb | 3 +
apps/workbench/app/views/collections/show.html.erb | 3 +
.../app/views/pipeline_instances/show.html.erb | 22 +--
.../views/pipeline_templates/_show_recent.html.erb | 3 +-
.../app/views/pipeline_templates/show.html.erb | 1 +
apps/workbench/app/views/projects/show.html.erb | 10 +-
apps/workbench/test/integration/jobs_test.rb | 29 ++++
.../test/integration/pipeline_instances_test.rb | 22 ++-
.../test/integration/pipeline_templates_test.rb | 31 ++++
docker/java-bwa-samtools/Dockerfile | 5 +-
sdk/cli/bin/arv-run-pipeline-instance | 13 +-
sdk/python/arvados/collection.py | 10 +-
sdk/python/arvados/keep.py | 130 +++++++++--------
services/api/app/models/job.rb | 1 +
services/api/app/models/pipeline_instance.rb | 1 +
...d_description_to_pipeline_instances_and_jobs.rb | 11 ++
services/api/db/structure.sql | 9 +-
services/api/script/crunch-dispatch.rb | 60 ++++----
services/fuse/arvados_fuse/__init__.py | 18 ++-
services/keepstore/block_work_list.go | 160 +++++++++++++++++++++
services/keepstore/block_work_list_test.go | 149 +++++++++++++++++++
services/keepstore/handler_test.go | 13 +-
services/keepstore/handlers.go | 24 +++-
services/keepstore/keepstore.go | 3 +-
services/keepstore/pull_list/pull_list.go | 81 -----------
30 files changed, 627 insertions(+), 220 deletions(-)
create mode 100644 apps/workbench/app/views/application/_name_and_description.html.erb
create mode 100644 apps/workbench/test/integration/jobs_test.rb
create mode 100644 services/api/db/migrate/20140911221252_add_description_to_pipeline_instances_and_jobs.rb
create mode 100644 services/keepstore/block_work_list.go
create mode 100644 services/keepstore/block_work_list_test.go
delete mode 100644 services/keepstore/pull_list/pull_list.go
via 9e2357191ca21631bcb6d8cf7a640d456a1a6cfa (commit)
via 1f1963df75f584d575fd440206e3ac64064cf06c (commit)
via 2749cf271f44f3783a3c2c9c309e0508da7d9446 (commit)
via 4cfb296612f7b483b56c36f119ca175def706d2f (commit)
via 87163a6ec678b841ced3824cbbe40ac20544821b (commit)
via 452baf1ec1b55c6c4613972ee5f6b5ebf28e8ed7 (commit)
via 82c5dcae45765d61f9af973bb3c02f878aa40804 (commit)
via 391c3551e763834bdc4c18db8051905d2c338f83 (commit)
via c49db117daf8993185cb271ea90d89e841e01117 (commit)
via 63af4052e2899a275930678bda65d82e857e1a39 (commit)
via a6f8d9e254b27305f8f61adc04b685206531237e (commit)
via 91fe76f4a3f8e5f59d12343ae69d2ba5a43d8e55 (commit)
via 19ba184b0a37d93b5ef5679be8bcc72417887d62 (commit)
via 46ad2015c1db3662a1ece565df06acbbfd7ee7ec (commit)
via facb6375180b37b628c417e97a181abe71e3181c (commit)
via 46f5403fdd2b3b0bd26d81d81ba509c624f54bb3 (commit)
via 4dedb0cc8921e7210ed245107b83996eb0d4e974 (commit)
via 642670d6614fe30f3ad4248f8415a290c6c3ad45 (commit)
via bc7b64beb18c4b8900a9d14f9539b184ef37cb64 (commit)
via ac79a0b185c3f9bf163c7685040e49c59825e17a (commit)
via 1065f68b84a650980cbcc1e0dd51b587d075f06b (commit)
via 5df584b3e49ccb52419449da016d86b08510f959 (commit)
via 7faaccf29475d419f55fe43e53dffd40392f48fa (commit)
via bf775ee6fbbfec9b7d8736aea57dcb0f2b770f60 (commit)
via a6e1c4ee0d72d0b3f5443dcf309135a4d609c0c2 (commit)
via 0119bfdc48c03588e91a9fdbafe77bfd62d89c20 (commit)
via fcf7b0770eb45beb57f32f7855aa76e9bf28690c (commit)
via ff9f9c7e1a664a36bcffd54c7269c08d5bf1d436 (commit)
via 45f25c3c3db844e2fa54d0d8761607ecc4304149 (commit)
via 96d9f313205dcc038a50c25a3ffdacd6516f62bf (commit)
via 4bde33a6a4ad1390504e270ee2ea881a867b5d5b (commit)
via 32b97aec0d210ec7a951f441cc6a44b4d0921a90 (commit)
via a31f94b1b433964c1481c384f2989392321d5529 (commit)
via 0cf2f356035164cd92e4a5722f0dd25c7502164e (commit)
via 577bd728e410d6a9b57b11578264b61220a50d76 (commit)
via 0bf498cd8a240f70517d44e3dab0fa000468531d (commit)
from 0d1919c4b29f66c9af5a912f770dccce4a314e5f (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 9e2357191ca21631bcb6d8cf7a640d456a1a6cfa
Merge: 0d1919c 1f1963d
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Sep 17 09:13:52 2014 -0400
Merge branch 'master' into 3605-improved-dashboard
Conflicts:
apps/workbench/app/models/job.rb
services/api/app/models/job.rb
diff --cc apps/workbench/app/models/job.rb
index ff2eb00,9e9c096..1006660
--- a/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@@ -34,28 -38,7 +38,31 @@@ class Job < ArvadosBas
arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {}
end
+ def self.queue_size
+ arvados_api_client.api("jobs/", "queue_size", {"_method"=> "GET"})[:queue_size] rescue 0
+ end
+
+ def state
+ Job::state(self)
+ end
+
+ def self.state job
+ if not job[:cancelled_at].nil?
+ "Canceled"
+ elsif not job[:finished_at].nil? or not job[:success].nil?
+ if job[:success]
+ "Completed"
+ else
+ "Failed"
+ end
+ elsif job[:running]
+ "Running"
+ else
+ "Queued"
+ end
+ end
+
+ def textile_attributes
+ [ 'description' ]
+ end
end
diff --cc services/api/app/models/job.rb
index 6e87bda,32f28e3..e142d8d
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@@ -40,7 -40,7 +40,8 @@@ class Job < ArvadosMode
t.add :repository
t.add :supplied_script_version
t.add :docker_image_locator
+ t.add :queue_position
+ t.add :description
end
def assert_finished
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list