[ARVADOS] updated: 2c7b72059f8390d56f7031206772dc3d4e4ad5da
git at public.curoverse.com
git at public.curoverse.com
Mon Oct 6 15:04:01 EDT 2014
Summary of changes:
apps/workbench/Gemfile | 1 +
apps/workbench/Gemfile.lock | 4 +
apps/workbench/app/assets/javascripts/dates.js | 3 +
.../workbench/app/assets/javascripts/log_viewer.js | 2 +-
.../app/assets/stylesheets/application.css.scss | 15 +
.../app/assets/stylesheets/projects.css.scss | 9 +-
.../app/controllers/actions_controller.rb | 23 +-
.../app/controllers/application_controller.rb | 26 +-
.../app/controllers/collections_controller.rb | 38 ++-
.../controllers/pipeline_instances_controller.rb | 18 +-
.../app/controllers/projects_controller.rb | 19 +-
apps/workbench/app/controllers/users_controller.rb | 22 +-
apps/workbench/app/helpers/application_helper.rb | 6 +-
.../app/helpers/pipeline_components_helper.rb | 3 +-
.../app/helpers/pipeline_instances_helper.rb | 115 +++++--
apps/workbench/app/models/arvados_base.rb | 4 +-
apps/workbench/app/models/collection.rb | 2 +-
apps/workbench/app/models/job.rb | 20 +-
apps/workbench/app/models/node.rb | 2 +-
apps/workbench/app/models/pipeline_instance.rb | 8 +-
apps/workbench/app/models/user.rb | 2 +-
apps/workbench/app/models/virtual_machine.rb | 2 +-
.../app/views/application/_content_layout.html.erb | 10 +-
.../app/views/application/_job_progress.html.erb | 88 +++---
.../views/application/_job_status_label.html.erb | 11 -
.../application/_pipeline_status_label.html.erb | 2 +-
.../{show.html.erb => _title_and_buttons.html.erb} | 45 ++-
apps/workbench/app/views/application/show.html.erb | 71 +----
.../app/views/collections/_show_files.html.erb | 4 +-
.../collections/_show_source_summary.html.erb | 3 +-
apps/workbench/app/views/jobs/_show_log.html.erb | 48 ++-
.../workbench/app/views/jobs/_show_recent.html.erb | 8 +-
.../workbench/app/views/jobs/_show_status.html.erb | 110 ++-----
apps/workbench/app/views/jobs/show.html.erb | 38 +++
.../pipeline_instances/_running_component.html.erb | 172 ++++++++++
.../_show_components_json.html.erb | 14 +
.../_show_components_running.html.erb | 252 +++------------
.../views/pipeline_instances/_show_recent.html.erb | 2 +-
.../pipeline_instances/_show_tab_buttons.html.erb | 9 +-
.../app/views/pipeline_templates/show.html.erb | 4 +-
.../views/projects/_compute_node_status.html.erb | 45 ++-
.../views/projects/_compute_node_summary.html.erb | 10 +-
.../app/views/projects/_show_dashboard.html.erb | 139 ++++----
.../app/views/projects/_show_tab_contents.html.erb | 2 +-
apps/workbench/app/views/projects/show.html.erb | 6 +-
.../app/views/users/_manage_repositories.html.erb | 5 +-
apps/workbench/app/views/users/_tables.html.erb | 6 +-
apps/workbench/config/application.default.yml | 19 +-
apps/workbench/config/application.yml.example | 4 +-
apps/workbench/test/diagnostics/pipeline_test.rb | 2 +-
.../test/functional/actions_controller_test.rb | 12 +-
.../test/functional/collections_controller_test.rb | 41 +--
.../pipeline_instances_controller_test.rb | 110 ++++++-
.../test/functional/users_controller_test.rb | 11 +
.../workbench/test/integration/collections_test.rb | 60 ++--
apps/workbench/test/integration/jobs_test.rb | 56 ++++
.../test/integration/pipeline_instances_test.rb | 41 +++
apps/workbench/test/integration/projects_test.rb | 80 +++--
.../test/integration/user_profile_test.rb | 2 +-
apps/workbench/test/test_helper.rb | 23 +-
doc/api/methods/nodes.html.textile.liquid | 2 +
doc/api/schema/Job.html.textile.liquid | 1 +
doc/api/schema/Node.html.textile.liquid | 1 +
docker/api/Dockerfile | 3 +-
docker/api/application.yml.in | 2 +
docker/base/Dockerfile | 2 +-
docker/build_tools/build.rb | 1 +
docker/config.yml.example | 5 +
docker/jobs/Dockerfile | 5 +-
docker/passenger/Dockerfile | 6 +-
sdk/cli/Gemfile.lock | 32 +-
sdk/cli/README.textile | 11 -
sdk/cli/arvados-cli.gemspec | 17 +-
sdk/cli/bin/arv-run-pipeline-instance | 74 ++---
sdk/cli/bin/crunch-job | 38 ++-
sdk/go/arvadosclient/arvadosclient_test.go | 8 +-
sdk/go/keepclient/keepclient_test.go | 4 +-
sdk/python/arvados/commands/keepdocker.py | 2 +-
sdk/python/arvados/keep.py | 16 +-
sdk/python/bin/arv-get | 6 +-
sdk/python/setup.py | 22 +-
sdk/python/tests/run_test_server.py | 8 +-
sdk/python/tests/test_keep_client.py | 38 +++
sdk/ruby/arvados.gemspec | 21 +-
.../api/app/controllers/application_controller.rb | 1 +
.../app/controllers/arvados/v1/jobs_controller.rb | 16 +-
.../app/controllers/arvados/v1/nodes_controller.rb | 18 ++
services/api/app/controllers/static_controller.rb | 17 +-
services/api/app/mailers/admin_notifier.rb | 12 -
services/api/app/mailers/user_notifier.rb | 3 +
services/api/app/models/arvados_model.rb | 13 +-
services/api/app/models/job.rb | 184 ++++++-----
services/api/app/models/node.rb | 12 +
services/api/app/models/user.rb | 24 ++
.../admin_notifier/new_inactive_user.text.erb | 4 +-
.../api/app/views/admin_notifier/new_user.text.erb | 4 +-
.../views/user_notifier/account_is_setup.text.erb | 4 +-
services/api/config/application.default.yml | 38 ++-
services/api/config/application.yml.example | 2 +
services/api/config/routes.rb | 1 +
.../db/migrate/20140918153705_add_state_to_job.rb | 23 +-
.../20140924091559_add_job_uuid_to_nodes.rb | 13 +
services/api/db/structure.sql | 9 +-
services/api/lib/has_uuid.rb | 2 +-
services/api/script/crunch-dispatch.rb | 350 +++++++++++++--------
services/api/script/rails | 2 +-
services/api/script/update_node_attributes.rb | 106 -------
.../test/fixtures/api_client_authorizations.yml | 6 +
services/api/test/fixtures/collections.yml | 58 ++++
services/api/test/fixtures/groups.yml | 9 +
services/api/test/fixtures/jobs.yml | 48 +++
services/api/test/fixtures/links.yml | 61 ++++
services/api/test/fixtures/logs.yml | 9 +
services/api/test/fixtures/nodes.yml | 37 ++-
services/api/test/fixtures/pipeline_instances.yml | 81 +++++
services/api/test/fixtures/pipeline_templates.yml | 27 ++
services/api/test/fixtures/repositories.yml | 5 +
services/api/test/fixtures/users.yml | 22 ++
.../arvados/v1/collections_controller_test.rb | 55 +++-
.../arvados/v1/groups_controller_test.rb | 74 +++--
.../functional/arvados/v1/jobs_controller_test.rb | 88 ++++--
.../arvados/v1/keep_disks_controller_test.rb | 22 +-
.../functional/arvados/v1/links_controller_test.rb | 44 ++-
.../functional/arvados/v1/logs_controller_test.rb | 22 +-
.../functional/arvados/v1/nodes_controller_test.rb | 72 +++++
.../functional/arvados/v1/users_controller_test.rb | 348 ++++----------------
services/api/test/helpers/users_test_helper.rb | 100 ++++++
services/api/test/integration/groups_test.rb | 42 +++
services/api/test/integration/jobs_api_test.rb | 2 +-
services/api/test/integration/users_test.rb | 216 +++++++++++++
services/api/test/test_helper.rb | 20 ++
services/api/test/unit/job_test.rb | 105 +++++--
services/api/test/unit/log_test.rb | 6 +-
services/api/test/unit/node_test.rb | 6 +
services/api/test/unit/permission_test.rb | 13 +
services/fuse/arvados_fuse/__init__.py | 9 +-
services/fuse/bin/arv-mount | 3 +-
services/fuse/setup.py | 22 +-
services/fuse/tests/test_mount.py | 8 +-
services/keep/tools/traffic_test.py | 4 +-
services/keepproxy/keepproxy_test.go | 2 +-
services/keepstore/handler_test.go | 120 ++++++-
services/keepstore/handlers.go | 76 ++++-
services/keepstore/keepstore.go | 14 +-
144 files changed, 3207 insertions(+), 1741 deletions(-)
delete mode 100644 apps/workbench/app/views/application/_job_status_label.html.erb
copy apps/workbench/app/views/application/{show.html.erb => _title_and_buttons.html.erb} (69%)
create mode 100644 apps/workbench/app/views/jobs/show.html.erb
create mode 100644 apps/workbench/app/views/pipeline_instances/_running_component.html.erb
delete mode 100644 sdk/cli/README.textile
create mode 100644 services/api/db/migrate/20140924091559_add_job_uuid_to_nodes.rb
delete mode 100755 services/api/script/update_node_attributes.rb
create mode 100644 services/api/test/helpers/users_test_helper.rb
create mode 100644 services/api/test/integration/groups_test.rb
create mode 100644 services/api/test/integration/users_test.rb
via 2c7b72059f8390d56f7031206772dc3d4e4ad5da (commit)
via 370366c748b22f5c230bf11e209a190612c088e7 (commit)
via fb036b6bb6a63d4cf0e05f7b0fc3bae0ff1ef026 (commit)
via 86b14bac0b6413dd033285a4357cc7edd05a22b3 (commit)
via b344d16c97448505432c0f0e9f9f964bfae07d50 (commit)
via 4096f6dfa7b7f5dfbe230922fa8fe2f9bf4b280d (commit)
via 4b3e5e50e262fc51a158c1aed1942b1ef176e2eb (commit)
via d7d1d0f327ddc42d2d06b836863f51e09793894b (commit)
via e79e5c258fe6ec542c3f2bb3c4230a5de2812b25 (commit)
via 49c507b0bb60e35b951e2f4946c28d7c6729ce88 (commit)
via 136f77bed67bd349fb73053379dcb7bae6a16592 (commit)
via fd7a118e0c88693efdb3662a5bd70b7cdb58eda3 (commit)
via 55f0cfccfee8d366514a474d77cfff9befe44715 (commit)
via 0a78f5a0efe0c88fddcd2ee91065f2a8da79055a (commit)
via 350f4d5a3ef163b37de2b83bd6fefd37f1a35b8b (commit)
via 1c638636ed50c1eafbf58d4f846b7b1e34c17cad (commit)
via 6a9589b47e553bc3576c3f12492de68962af50d3 (commit)
via e8b1da0f4cf859ba6bc34e4390fbad097d7a00d9 (commit)
via 60998a3875f79482533976e6e0ee0f99a9589c46 (commit)
via 89e7c751bc5eb9ac467f607c9e172e44c1690f4c (commit)
via 8af19c273f0d9b6a2711bd8a17b53d4b2f61c6c2 (commit)
via 37a349fc026e4559072e5b53c8855be42bf91dcd (commit)
via b1d1c5acf6f237d5e2a02414dd59e92cdb862237 (commit)
via fe8657ef0f8698837e9bdb5e9c1bf26a068efba9 (commit)
via 2fcc6fabb45befcc2ee4fe237744d6e3df5c4e39 (commit)
via 62790d76daf181a457d8f47741721967cd9cb7d9 (commit)
via 2935de4fbccf43b7daedb9412f2ada1bf65c52ab (commit)
via 23acabd1c9685b0a30027a643ebc10b25d3985d3 (commit)
via a8bd120b4b5056e7a688e6ce4a60c1251fe7cb0f (commit)
via 165a36741ced8d09ec15aa30873e51dab2b3e215 (commit)
via 982b439de0d2113c1e131e53bc6b8151901d77f9 (commit)
via 5d006b95fdcbb48afffef8272b4d2071acb5221b (commit)
via a9a3fe7f94ebf14a5e70a642a596010572544424 (commit)
via b7ab1e8793ea06c5b778ce2249b29f4ab1607c58 (commit)
via f35e15efbfe9466d8e08b939e5407e36454a0bc8 (commit)
via 754495b451fb7dc65fe2d2c43fa4876638b0be66 (commit)
via 9378424698db0e02856d09586333cac9142331b2 (commit)
via bd99df2e6c5f7bb0b75c7fa2f1a9c1c2defeca8a (commit)
via 4ff61dd25a70e6467bbafeaaf794cc381f684384 (commit)
via 196b4b55725db26af4000162329421c73ca893af (commit)
via edc5e4b6645b9b983a85a892bf3d3ad1432a657d (commit)
via 359d96e3442f93094703a6966aecca9b0a90f55b (commit)
via d9d74825806615a539da950686ae801bbbf60e24 (commit)
via e910d13fc5fc63a86f20be3b758c08db3d429bc6 (commit)
via 4769d3156e5d486837f7eb524ab5ca798ed090dc (commit)
via 3ee8ac519f0c3f3fd211372d2a4699586d5c2aa8 (commit)
via d9df153743ada521cb42852ce2b4879b1981bbd9 (commit)
via 3ff644b461b69c38418384e532e3741a07333daf (commit)
via dd0f2323bd5fbcef6a3921c45d6e3025a77d2e35 (commit)
via 9b16ff9eb231584fcfda5eed029b1c1b08a0b819 (commit)
via 34e461fe9d33283d8e2135802ee9accb30a5e34f (commit)
via 70b1ac0b5a02879bb5b60f651bf0810e8362f074 (commit)
via 8f1554cf9cfc279e0127d7ea2c7a79a98e323f13 (commit)
via 407f1cf196f60f4af21c89cbdccb2c98e05518fb (commit)
via 54a951255316417a42a3bd8c77aaa0b58d180440 (commit)
via 3412c35d3da73b94c133099dceab9770fb465165 (commit)
via 74cdb4454d4adc6b403c207169313f37332d8aac (commit)
via a5c4a1d17c5ea0916ae5049c19841d820f850a84 (commit)
via e6fbedf93f4db7325872537e36c4175c8fea0bea (commit)
via 1afcc0c00dc9f901acce6d5b166ee51c497f8555 (commit)
via 3dfc071494cbb0386ecd7269c72a435fc7f9cc24 (commit)
via 5233f1d185706095d2f045b8431781c9a421ee16 (commit)
via 6b17ef224b600b3ce889546d648df43d8aea81f4 (commit)
via 92d5df330b86fb4c279a6e030258b860bed37358 (commit)
via 3cdc055b90fd859cbd0e101becb4abd78f4d467f (commit)
via 84798b73902fdf81f68ec55365e3a356cb8dec95 (commit)
via 79da2069356cf4173795501af861ec947195e183 (commit)
via a4679fb93b4b835509cc77f9bf2fdce02d40520e (commit)
via 6319bc1895aaf8d2a7f944e45e52c960f931a11e (commit)
via 6d6de24e35e291ef9b7a0f05def9b8e8ea5f7508 (commit)
via 5a341ad3a358bfadb96c83fb95acb7ce3f50cd83 (commit)
via 4f41341675c108e9ffa4e5ba15b8bca521152a67 (commit)
via dc29394d6e4df36a1cab5beae69c3331e037bdb1 (commit)
via 521df5cd1e19a671a4f940128c5c61930df9c8bb (commit)
via 74bcc470f33cd47ca4106a7565871c07c40f9c00 (commit)
via b3fd3679187be8e51d31cb6bf17613cc488cda4b (commit)
via 641a04fc2dd876440ed983a4cdf0e03f188040c1 (commit)
via f1c20b66097f1bb37c0ffc8808b4a5831e91f87b (commit)
via c53ffcb20017ae0f99fc49095c7008555ac171cc (commit)
via 2ca602f880757f016f8d0d212b8851818decc718 (commit)
via f6d1dd8018f7facf8e4c1f3c82ce777fec1d5a6a (commit)
via 99ba15c7f425c042fb61b454bba27324c80b7649 (commit)
via e3927b68de6d280a4172bd862bf61d5d0cb585ce (commit)
via 7b2d04380952ac79453bd0771679e40c81281f5c (commit)
via 4d2b509734d1ac5351ab6da16e08a092ba77f148 (commit)
via 0c376a152770021334e0b2c3cb7c897dd4ad74bd (commit)
via 070ca0d5fdd81ed1d3a32fbfc4d1329bb911bdf1 (commit)
via 093bae4c914a872c501c3235f06096092725f015 (commit)
via 33b559e83dedac970335819388b609ed01001db6 (commit)
via 9756d91f6f1e2472184be0dc45e8849c2c9ab35b (commit)
via bb3ec0fefd17c68d9c0123dcfcc5e4ef616fb25e (commit)
via 16b0697d6ea10d21381936bc9b5ad10914deb9b1 (commit)
via 15869244560757aaa6187de437d73dbbdfb2e4db (commit)
via 029656d8b2646bae51de03426a6496cbce0cc9d7 (commit)
via 0fc69ec920fb2edf48a196adfbce1e7c66218f04 (commit)
via cad9d2f9fe930e51279a8496929857039deea2de (commit)
via f9ec9073f2077d81567922d612d79e8bcf3a11ba (commit)
via c360335c441219f20eb6c598870a6a727edc88b4 (commit)
via c02331eb9e7d302efdd788af0dd3ba9124352edb (commit)
via 195b23ed7fd0c6261d0a945a9f0e541d78a0648e (commit)
via ebdbddd3c85ab869afcf689efd7cb4b6207000b3 (commit)
via b506247f4a34e1a409f57c3a01c07a94970fe68f (commit)
via 2873926cdbfc8012b276db11d24cea3ad6a4bdd4 (commit)
via b27fe91e18bec8df031e4c8bf87f4da293d7b733 (commit)
via 936ea7131a5c0e254ef213e5e2fe390e4e52e872 (commit)
via 1b189a0961ba757caf6160285b59daa26c7cdcae (commit)
via d4724463bd248922dc37b43f59d54890d10581c1 (commit)
via 93817175e247780a3aa74494e3d2f08eb1a9cd37 (commit)
via eaf8fb3be8218971b9a66d10b7bbabbbf92cd041 (commit)
via c2c38069d28fc68dea6e1b2cb0d5f4f36e1ef03f (commit)
via d592a37f987ed90e017bc9d2d962a2f620e27095 (commit)
via 22c3f131e929bef5574ef71a98bc48290c36dfb3 (commit)
via a3787ef83a0538097fb6f802f675be740a241ebc (commit)
via ce410ef35e137e040ace097a74a33f04c5975ad9 (commit)
via c491bfd795b7c7c4f26f18003290bd7ec9e88d60 (commit)
via 9bf347ea56bc74da1c0ff1a3809faf1ae58f5890 (commit)
via abc1db31bae1b33ed899a1da4b59f2edc0f5f189 (commit)
via 1d8f975be8d35444aca0f21a0b6c91bc4a277662 (commit)
via 4e8745c2a744a2c3e6b44ee6100fb1a26749cebf (commit)
via a805395a2a64aa83a1604ade6932151a0846b577 (commit)
via 39507a40922e11e6863e4dd788ad3231e6fb3224 (commit)
via 0b1b373da53fe7177a7f62523ef30ca79cfbea53 (commit)
via 6d324fb5962e8425393c921c2def4aa1506c7230 (commit)
via 48d04722a5e0478e22be33f58036806a55b3a0eb (commit)
via 44242bfe2c86302c65650cf7fe3a7187223c6304 (commit)
via bbaaeabfc2d28c8a24f106b81e6677832cd68b3d (commit)
via 0226ff322cc71b540f3ca7469ad1ecf1af95d8cd (commit)
via 1d135e43d06148b100fbc8534144b405e4824af9 (commit)
via c2e491ff35fe12d895587a6e7cf0cc9f1f7bfcd9 (commit)
via 2861857a87d4c40924f783862ee09e91cec0b96f (commit)
via 88650e2c0020e1122449d7b91ad3ebf78bab9d23 (commit)
via bd3979a09bd74b6311e9d242bc040915d417253f (commit)
via 94b11dfc98ed84d0f91f2bc2fc81e76b4d3c35d7 (commit)
via e9622f371ad4d75f0a0b5ee9480fae779dd63156 (commit)
via 5253b7d81a54c6087b35148499c360c692fac870 (commit)
via a452ab111d29f4f06d31c3fe760bb17b211020a6 (commit)
via 8bc77d6ee612217cfb50bca997ce3b94c19637e9 (commit)
via 90e9b3c5ef43242afc42770d03c61489d69c1de5 (commit)
via 7e9bb68c02ff8b21747ad88c89d79395b4c091c0 (commit)
via c50fe608334f9fc2e19969f41c04d671cb9c0a19 (commit)
via 9ead624f8ea10f60a6472edb2d15ac576af85515 (commit)
via be3b98a52ae6773913696955e2d9c6585fc89441 (commit)
via caa5dd776dfad5e50592a5cc2824c70ac3474b46 (commit)
via 11b71c18e7506374953119d717f7c4e8c52f8bc4 (commit)
via 4bb3091019c84f748a60492fb52dcc0bba0bbef0 (commit)
via 9b21fc7fa2702c8901a6b3f00db6c07fe7cb6849 (commit)
via 142c18d8174004fc0665106cae71b6f18ba7980b (commit)
via 081ffd25912e960854427a7c0531c6dbb78d1b4c (commit)
via 586b30b8171da19a4d777c6c2edf4cd7f2fdecfe (commit)
via ef6972c6f0e42266220d3d256f69f817f559bf2c (commit)
via 48694918fb3e78857d921766784f04cc49dc1ab1 (commit)
via 36975ebf86c37148ef38a5facd10fad2a977efc9 (commit)
via 15902f15dc95b9ecb0e0193f9bcdc437fb4fe6f9 (commit)
via 469f117ead24509639fb5b6ba6c9bd1b6067460c (commit)
via 7943691e146fecc929f1dcde2f794ab32fadc565 (commit)
via 4671db01d21dad219582444592e99a74d1fa35d8 (commit)
via c5ac04b90cb26e49efb16b322d82913eae2ef423 (commit)
via 9daebff7dfeaa7092da078f3a0bfdc0c9d8e51e0 (commit)
via 4d44df51ee042c2acced50a838a74eb441fcf73b (commit)
via 32a058657ee1445c4a1c86368ede5287d6274f98 (commit)
via 9a15397a7e030704f63441d6e7893cb3d8be1d64 (commit)
via 8a833d4bb82249d3f2b9c0473c0af51db92fdc72 (commit)
via d962404672ddd32804ddc7b8f502d01843e36404 (commit)
via 9700a3a646ea5e1d50e5525bd094e8eb90af8ce1 (commit)
via 8f3b2fc8dbe18a031fb7aa943b626a0f3932c3ec (commit)
via 6741a2db39cab991efd28d742071170fdbe908f2 (commit)
via 44e4d85c32d5e4ea4dc651570672e59d7a10d3b3 (commit)
via 8b4cd21c6bd056e4ebf7487132a454cb5b8aacc5 (commit)
via 3154ba6b56adb7a76bd5665c6c4c3326efea8eaa (commit)
via b0fa2109b62079c50c5228d227c591fde7b40ab7 (commit)
via 77ad02138232ebf8885ceef5b4c398bf6fd39587 (commit)
via 24fd61eb70995d505bd990a79339571294b8f6eb (commit)
via 409fe707a4d05f1986d7bb0c29ec977d19aa63f5 (commit)
via da0d61f9a95848d47d28462d89e0a2070c39d587 (commit)
via 9340ba16925c4288e6de8a457b74ae9524b04213 (commit)
via e350e7a5a074d6666f60b0a1789dce8da3037d8f (commit)
via 37404e821668b6b9b1952a0a5a3b28901835884b (commit)
via 3d84dd62a85647e9b3dfc34af8303c09b9923498 (commit)
via 93c7127afd21f82662e9b471e7c617ae8c59ad19 (commit)
via 68dc1fcaec00d7d954be19f2c184e04626639616 (commit)
via 0091abfb8041e1f63ba8b7ec9baa7bb57a05bcdb (commit)
via 1a8481cd4ebacf2036090273bb6b9444dbed16a8 (commit)
via 2a8d349eaf2b1ac2254056ea32859f72a226d63f (commit)
via 301917a75b61cd8a9447b5c525c38dc2e3416c9e (commit)
via 4c53b3aee935b41e11c71ff1468a10d6a80c390c (commit)
via c8ad3a2a0f27964eff5d5c2d845afab728836473 (commit)
via 2b0a7c3f635bc2340956d670c6aeda417dd11cec (commit)
via 8716b38d3cd20640c28b6fe048927309a0f916cd (commit)
via f76e58645366a0cf1d33e8d681cb051e313ea713 (commit)
via af09cce22f077b5a537e1b7eea8d98981de9f400 (commit)
via 5fd423a57ab1f34162f4cb2c08bd6b0b2515af40 (commit)
via 2e940d5cd2a39b31dacf2aa65487ed62645abe14 (commit)
via d7c09707b2b5146367c2988b75deffce21b5ae2c (commit)
via 2bab50e5573bec3e46585fe23e2ffb26b1b8fe55 (commit)
via 8c52fddd7b87b36bbd5cb0d362009df33ef5f0fc (commit)
via 06a956718e8dd55a2cdd4a84fcdfb7a3b5a0f635 (commit)
via 8c97b8ad6f4b026f8bd2626a6d1b76d2fc60f253 (commit)
via b25e164d6cfc0712be5856c63f7592145669232d (commit)
via 362be0f8b6b1d559e041c8cda7d9f154fb93ee97 (commit)
via 2832018a959557515bfad1f763bf8d4b72182fd6 (commit)
via 9c7058321b88320594fccec767a8326e0bb9db4f (commit)
via 92211c8bed5aaf3abd83d02c4adbaf2329123bac (commit)
via 1d5d09e8d1568fdae039571306bd5e56a8273ac7 (commit)
via 1513d62bc0716698b71789f7affbf78e675cbff8 (commit)
via 039e808b1be1f2106118dc20174977d8e8766125 (commit)
via eec77d22e408fe3983cba666c6f5185ecf2d15ec (commit)
via 4ea6cda50c7fcd3d30ac01e8a421cc68cd4ea23d (commit)
via eb8dc9dee0793139aac55f4aa65a7b2de433afea (commit)
via 3f7a73ef946efc268017fc6f5ea31868e18d39dd (commit)
via 5ef678825d7b436526489e9158a916b605814133 (commit)
via d2517f46eb0d1a668ac8124144220436c80d6f65 (commit)
via ae346e842a13be74e4b4d44afb0ec61b7a2749cb (commit)
via 240ab2c50a01531df162850be255a4c4e1084fc2 (commit)
via 3e3df723e221dadf2512ac4935c1f6f0fe8f7834 (commit)
via d23d4ce9e4c52605cb23286b9e9b46a808f7437d (commit)
via 5af4f00db1cbac83f52bf02b424968fd0ef387b1 (commit)
via 1fc256cee80eef7aa2178789f23a729ba9f27b79 (commit)
via d6478bb286c0bb1e7b8af67fb4800db792200022 (commit)
via 22c7912d7c62877647fc714cd0bbef8f37a2b120 (commit)
via 5b2a15b6a4addfc648ef1060be47ffef64e64777 (commit)
via d70e5d076e907266c0f40364aaa69fdce449ce9f (commit)
via 7e27eb2cca7e9e22ad1f56a6f0ecbbc40ad4cb64 (commit)
via 104244f9ab68f409dbad2272910c21e317994a5d (commit)
via 2e8aee62b13edd8eac34ac8536d41992c7adbf69 (commit)
via 80ec2c7fe823b84ba5b3533f3c43d1bf3c627f70 (commit)
via 96e711607984bd74a682dd3f3819dbc453a6591b (commit)
via 6fcb589fc76b9251a142dd76d3019c993cfcd71c (commit)
via 59607e4635868117051d77aa4a84fa9f689c52e7 (commit)
via aecc7109edd37aee2388c06a36d5c8ba853b3267 (commit)
via ccff8ce154b393512dd4b563853f63a9abeefba4 (commit)
via 4eaf39dbe947beaaa87e656b470d7f21880ba607 (commit)
via 148306afed19fc9138a04bcf161d8f24d83b2ac0 (commit)
via f9a2ed53565bf921821dff5e2120b6496ac9acdd (commit)
via 2b6f61a7d202b771be7e85c14fb4d1cb592142ec (commit)
via 8934b505b0cdd6af699d910148046ede7c44b7da (commit)
via c446dd845656e944c2d3f91f8d00e320c37b66a1 (commit)
via 15409c5e2b7946ff7f5fd104a6757a4d874448d4 (commit)
via c24d0cc28ee40a37d7f0ead787394765386e5413 (commit)
via 95723281b6a2b9d594f92cc5577c2f41e08338df (commit)
via 768889aad2bf97586d68b52af4f2b9ccae78251e (commit)
via fb9235f1b9abe0661eb7640c4db0ab7001f90f1d (commit)
via 1ccabc86f9eb3b51e02a3571d5b133fec8258f49 (commit)
via cbd11b4bfd5bcc637abe0e7678239dd1e7a2fbd2 (commit)
via 5be834f3ac1bdd81f2c40514cdb5795a8585e1f6 (commit)
from 52f0c22a42444d1db0648870ae42f918bd3f63c1 (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 2c7b72059f8390d56f7031206772dc3d4e4ad5da
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Oct 6 15:03:37 2014 -0400
3381: Merge job_status_label and job_progress into a single job_progress
partial. This partial renders a progress bar if the job is running, otherwise
renders a label with the job state. The progress bar now shows only 'done'
tasks and renders the progress bar in orange if any tasks have failed. Move
"done, failure, running, todo" from panel body to panel heading on
running_component partial. Dashboard now uses job_progress partial with
"scaleby" to indicate pipeline progress more precisely.
diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index eeb0545..fc7e462 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -257,7 +257,9 @@ span.editable-textile {
min-width: 1em;
padding: 0px 2px 0px 0px;
}
-
+.task-summary-status {
+ font-size: 80%;
+}
#page-wrapper > div > h2 {
margin-top: 0px;
}
diff --git a/apps/workbench/app/views/application/_job_progress.html.erb b/apps/workbench/app/views/application/_job_progress.html.erb
index 49ba39d..efe1819 100644
--- a/apps/workbench/app/views/application/_job_progress.html.erb
+++ b/apps/workbench/app/views/application/_job_progress.html.erb
@@ -1,43 +1,51 @@
-<%
- failed = j[:tasks_summary][:failed] || 0 rescue 0
- done = j[:tasks_summary][:done] || 0 rescue 0
- running = j[:tasks_summary][:running] || 0 rescue 0
- todo = j[:tasks_summary][:todo] || 0 rescue 0
-
- if j[:success] == false and done + running + failed == 0
- # The job failed but no tasks were ever started (i.e. crunch-dispatch
- # was unable to start the job). Display a full 100% failed progress bar.
- failed_percent = 100
- success_percent = 0
- running_percent = 0
- elsif done + running + failed + todo == 0
- # No tasks were ever created for this job;
- # render an empty progress bar.
- failed_percent = 0
- success_percent = 0
- running_percent = 0
- else
- percent_total_tasks = 100.0 / (done + running + failed + todo)
- if defined? scaleby
- percent_total_tasks *= scaleby
- end
- failed_percent = failed * percent_total_tasks
- success_percent = done * percent_total_tasks
- running_percent = running * percent_total_tasks
- end
-%>
-
-<% if not defined? scaleby %>
- <div class="progress">
-<% end %>
+<% if (j.andand[:state] == "Running" or defined? scaleby) and (not defined? show_progress_bar or show_progress_bar) %>
+ <%
+ failed = j[:tasks_summary][:failed] || 0 rescue 0
+ done = j[:tasks_summary][:done] || 0 rescue 0
+ running = j[:tasks_summary][:running] || 0 rescue 0
+ todo = j[:tasks_summary][:todo] || 0 rescue 0
+
+ if done + running + failed + todo == 0
+ # No tasks were ever created for this job;
+ # render an empty progress bar.
+ done_percent = 0
+ else
+ percent_total_tasks = 100.0 / (done + running + failed + todo)
+ if defined? scaleby
+ percent_total_tasks *= scaleby
+ end
+ done_percent = (done+failed) * percent_total_tasks
+ end
+ %>
+
+ <% if not defined? scaleby %>
+ <div class="progress" style="margin-bottom: 0px">
+ <% end %>
+
+ <span class="progress-bar <%= if failed == 0 then 'progress-bar-success' else 'progress-bar-warning' end %>" style="width: <%= done_percent %>%;">
+ </span>
+
+ <% if not defined? scaleby %>
+ </div>
+ <% end %>
+
+<% else %>
+
+<% to_label = {
+ "Cancelled" => "danger",
+ "Complete" => "success",
+ "Running" => "info",
+ "Failed" => "danger",
+ "Queued" => "default",
+ nil => "default"
+ } %>
-<span class="progress-bar progress-bar-success" style="width: <%= success_percent %>%;">
-</span>
-<span class="progress-bar progress-bar-danger" style="width: <%= failed_percent %>%;">
-</span>
-<span class="progress-bar" style="width: <%= running_percent %>%;">
-</span>
+ <span class="label label-<%= to_label[j.andand[:state]] %>">
+ <%= if defined? title
+ title
+ else
+ if j.andand[:state] then j[:state].downcase else "Not ready" end
+ end
+ %></span>
-<% if not defined? scaleby %>
-</div>
<% end %>
diff --git a/apps/workbench/app/views/application/_job_status_label.html.erb b/apps/workbench/app/views/application/_job_status_label.html.erb
deleted file mode 100644
index 17073fe..0000000
--- a/apps/workbench/app/views/application/_job_status_label.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% to_label = {
- "Cancelled" => "danger",
- "Complete" => "success",
- "Running" => "info",
- "Failed" => "danger",
- "Queued" => "default",
- nil => "default"
- } %>
-
- <span class="label label-<%= to_label[j[:state]] %>"><%= if defined? title then title else j[:state].downcase end %></span>
diff --git a/apps/workbench/app/views/application/_pipeline_status_label.html.erb b/apps/workbench/app/views/application/_pipeline_status_label.html.erb
index 9e5b710..8872272 100644
--- a/apps/workbench/app/views/application/_pipeline_status_label.html.erb
+++ b/apps/workbench/app/views/application/_pipeline_status_label.html.erb
@@ -1,5 +1,5 @@
<% if p.state == 'Complete' %>
- <span class="label label-success">finished</span>
+ <span class="label label-success">complete</span>
<% elsif p.state == 'Failed' %>
<span class="label label-danger">failed</span>
<% elsif p.state == 'RunningOnServer' || p.state == 'RunningOnClient' %>
diff --git a/apps/workbench/app/views/jobs/_show_recent.html.erb b/apps/workbench/app/views/jobs/_show_recent.html.erb
index c823fc5..d12ebb6 100644
--- a/apps/workbench/app/views/jobs/_show_recent.html.erb
+++ b/apps/workbench/app/views/jobs/_show_recent.html.erb
@@ -16,8 +16,6 @@
</th><th>
status
</th><th>
- progress
- </th><th>
uuid
</th><th>
script
@@ -37,9 +35,6 @@
<i class="icon-plus-sign expand-collapse-row" data-id="<%= j.uuid %>" style="cursor: pointer"></i>
</td>
<td>
- <%= render partial: 'job_status_label', locals: {:j => j} %>
- </td>
- <td>
<div class="inline-progress-container">
<%= render partial: 'job_progress', locals: {:j => j} %>
</div>
@@ -123,4 +118,3 @@
</tbody>
</table>
-
diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
index 038efec..3cdac9b 100644
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -2,7 +2,8 @@
<div class="panel panel-default">
<div class="panel-heading">
<div class="container-fluid">
- <div class="row">
+ <div class="row-fluid">
+ <%# column offset 3 %>
<div class="col-md-3">
<h4 class="panel-title">
<a data-toggle="collapse" href="#collapse<%= i %>" style="white-space: nowrap;">
@@ -11,11 +12,13 @@
</h4>
</div>
- <% if current_job %>
- <div class="col-md-1">
- <%= render(partial: 'job_status_label', locals: { j: current_job }) %>
- </div>
+ <%# column offset 3 %>
+ <div class="col-md-2 pipeline-instance-spacing">
+ <%= pj[:progress_bar] %>
+ </div>
+ <% if current_job %>
+ <%# column offset 5 %>
<div class="col-md-3">
<% if current_job[:started_at] %>
<% walltime = ((if current_job[:finished_at] then current_job[:finished_at] else Time.now() end) - current_job[:started_at]) %>
@@ -32,7 +35,8 @@
</div>
<% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
- <div class="col-md-5 text-overflow-ellipsis">
+ <%# column offset 8 %>
+ <div class="col-md-4 text-overflow-ellipsis">
<% if pj[:output_uuid] %>
<%= link_to_if_arvados_object pj[:output_uuid], friendly_name: true %>
<% elsif current_job[:output] %>
@@ -41,18 +45,29 @@
No output.
<% end %>
</div>
- <% elsif current_job[:state] == "Running" %>
- <div class="col-md-3 pipeline-instance-spacing">
- <%= pj[:progress_bar] %>
- </div>
- <div class="col-md-1 pipeline-instance-spacing">
+ <% elsif current_job[:state].in? ["Queued", "Running"] %>
+ <%# column offset 8 %>
+ <div class="col-md-3">
+ <% if current_job[:state].in? ["Running"] %>
+ <span class="task-summary-status">
+ <%= current_job[:tasks_summary][:done] %> task<%= if current_job[:tasks_summary][:done] > 1 then 's' else '' end %> done,
+ <%= current_job[:tasks_summary][:failed] %> failed,
+ <%= current_job[:tasks_summary][:running] %> running,
+ <%= current_job[:tasks_summary][:todo] %> pending
+ </span>
+ <% end %>
+ </div>
+ <%# column offset 11 %>
+ <div class="col-md-1 pipeline-instance-spacing">
<%= form_tag "/jobs/#{current_job[:uuid]}/cancel", style: "display:inline; padding-left: 1em" do |f| %>
<%= hidden_field_tag :return_to, url_for(@object) %>
<%= button_tag "Cancel", {class: 'btn btn-xs btn-danger', id: "cancel-job-button"} %>
</div>
<% end %>
+
<% elsif current_job[:state] == "Queued" %>
- <div class="col-md-5">
+ <%# column offset 8 %>
+ <div class="col-md-4">
<% queuetime = Time.now - current_job[:created_at] %>
Queued for <%= render_runtime(queuetime, true) %>.
<% begin %>
@@ -67,10 +82,6 @@
<% end %>
</div>
<% end %>
- <% else %>
- <div class="col-md-3 col-md-offset-3">
- <span class="label label-default">Not ready</span>
- </div>
<% end %>
</div>
</div>
@@ -154,19 +165,6 @@
<p>script_parameters:</p>
<pre><%= JSON.pretty_generate(current_component[:script_parameters]) rescue nil %></pre>
</div>
- <% if current_component[:tasks_summary] %>
- <div class="col-md-3">
- <table>
- <% [:done, :running, :failed, :todo].each do |d| %>
- <tr>
- <td style="padding-right: 1em"><%= 'tasks:' if d == :done %></td>
- <td style="padding-right: 1em"><%= d.to_s %></td>
- <td><%= current_component[:tasks_summary][d] %></td>
- </tr>
- <% end %>
- </table>
- </div>
- <% end %>
</div>
</div>
</div>
diff --git a/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb b/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb
index 08b24f1..f918e24 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb
@@ -56,7 +56,7 @@
<td style="border-top: 0; opacity: 0.5;" colspan="6">
<% ob.components.each do |cname, c| %>
<% if c.is_a?(Hash) and c[:job] %>
- <%= render partial: "job_status_label", locals: {:j => c[:job], :title => cname.to_s } %>
+ <%= render partial: "job_progress", locals: {:j => c[:job], :title => cname.to_s, :show_progress_bar => false } %>
<% else %>
<span class="label label-default"><%= cname.to_s %></span>
<% end %>
diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index 9ddd1d5..e384e42 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -32,55 +32,29 @@
<div class="pull-right" style="width: 40%">
<div class="progress" style="margin-bottom: 0px">
- <% running = [] %>
- <% failed = [] %>
- <% completed = [] %>
- <% queued = [] %>
<% p.components.each do |k, v| %>
- <% if v.is_a? Hash and v[:job] %>
- <% if v[:job][:state] == "Running" %>
- <% running << k %>
- <% elsif v[:job][:state] == "Failed" or v[:job][:state] == "Cancelled" %>
- <% failed << k %>
- <% elsif v[:job][:state] == "Complete" %>
- <% completed << k %>
- <% elsif v[:job][:state] == "Queued" %>
- <% queued << k %>
- <% end %>
- <% end %>
+ <%= render partial: 'job_progress', locals: {:j => v[:job], :scaleby => (1.0/p.components.size)} %>
<% end %>
- <% completed_pct = (completed.size * 100) / p.components.size %>
- <% failed_pct = (failed.size * 100) / p.components.size %>
- <% running_pct = (running.size * 100) / p.components.size %>
- <% queued_pct = (queued.size * 100) / p.components.size %>
-
- <div class="progress-bar progress-bar-success" style="width: <%= completed_pct %>%">
- <span class="sr-only"></span>
- </div>
- <div class="progress-bar progress-bar-danger" style="width: <%= failed_pct %>%">
- <span class="sr-only"></span>
- </div>
- <div class="progress-bar progress-bar-primary" style="width: <%= running_pct %>%">
- <span class="sr-only"></span>
- </div>
- <div class="progress-bar progress-bar-default" style="width: <%= queued_pct %>%">
- <span class="sr-only"></span>
- </div>
</div>
</div>
</div>
+ <%
+ running = p.components.select { |k, c| c.andand[:job].andand[:state] == "Running" }
+ queued = p.components.select { |k, c| c.andand[:job].andand[:state] == "Queued" }
+ %>
+
<div class="clearfix">
Started at <%= render_localized_date(p[:started_at] || p[:created_at], "noseconds") %>.
<% pipeline_time = Time.now - (p[:started_at] || p[:created_at]) %>
Active for <%= render_runtime(pipeline_time, false) %>.
<div class="pull-right">
- <% running.each do |k| %>
- <span class="label label-primary"><%= k %></span>
+ <% running.each do |k,v| %>
+ <%= render partial: 'job_progress', locals: {:j => v[:job], :show_progress_bar => false, :title => k} %>
<% end %>
- <% queued.each do |k| %>
- <span class="label label-default"><%= k %></span>
+ <% queued.each do |k,v| %>
+ <%= render partial: 'job_progress', locals: {:j => v[:job], :show_progress_bar => false, :title => k} %>
<% end %>
</div>
</div>
diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index acde5ce..45ca939 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -22,7 +22,6 @@
<th>Log</th>
<th>Created at</th>
<th>Status</th>
- <th>Progress</th>
</tr>
<%# Preload collections, logs, and pipeline instance objects %>
@@ -97,9 +96,6 @@
</td>
<td>
- <%= render partial: 'job_status_label', locals: {:j => j} %>
-</td>
-<td>
<div class="inline-progress-container">
<%= render partial: 'job_progress', locals: {:j => j} %>
</div>
commit 370366c748b22f5c230bf11e209a190612c088e7
Merge: 52f0c22 fb036b6
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Oct 6 12:58:19 2014 -0400
Merge branch 'master' into origin-3381-job-progress-bar-bug
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list