[ARVADOS] updated: 61dbc4445159c9140b0744bf5526ce0f71f4f374
Git user
git at public.curoverse.com
Fri Jul 1 17:49:22 EDT 2016
Summary of changes:
apps/workbench/Gemfile.lock | 5 +-
.../app/assets/javascripts/pipeline_instances.js | 2 +-
.../app/controllers/application_controller.rb | 15 +-
.../controllers/container_requests_controller.rb | 12 +
.../app/controllers/containers_controller.rb | 3 +
apps/workbench/app/helpers/application_helper.rb | 4 +
.../app/helpers/pipeline_instances_helper.rb | 5 +-
apps/workbench/app/models/container.rb | 6 +
apps/workbench/app/models/container_request.rb | 10 +
apps/workbench/app/models/container_work_unit.rb | 147 ++++
apps/workbench/app/models/job.rb | 4 +
apps/workbench/app/models/job_task.rb | 3 +
apps/workbench/app/models/job_task_work_unit.rb | 5 +
apps/workbench/app/models/job_work_unit.rb | 92 +++
apps/workbench/app/models/pipeline_instance.rb | 4 +
.../app/models/pipeline_instance_work_unit.rb | 54 ++
apps/workbench/app/models/proxy_work_unit.rb | 334 +++++++++
apps/workbench/app/models/work_unit.rb | 190 +++++
.../app/views/collections/_show_files.html.erb | 22 +-
.../views/container_requests/_show_log.html.erb | 1 +
.../views/container_requests/_show_status.html.erb | 1 +
.../app/views/containers/_show_log.html.erb | 1 +
.../app/views/containers/_show_status.html.erb | 17 +
.../workbench/app/views/jobs/_show_status.html.erb | 14 +-
.../pipeline_instances/_show_components.html.erb | 2 +-
.../_show_components_json.html.erb | 2 +
.../views/projects/_compute_node_status.html.erb | 47 +-
.../views/projects/_compute_node_summary.html.erb | 7 +-
.../app/views/projects/_show_dashboard.html.erb | 196 +++--
.../app/views/work_unit/_component_detail.html.erb | 116 +++
.../app/views/work_unit/_progress.html.erb | 12 +
.../app/views/work_unit/_show_child.html.erb | 77 ++
.../app/views/work_unit/_show_component.html.erb | 76 ++
.../app/views/work_unit/_show_log.html.erb | 24 +
.../app/views/work_unit/_show_outputs.html.erb | 12 +
.../app/views/work_unit/_show_status.html.erb | 6 +
apps/workbench/config/routes.rb | 4 +-
.../container_requests_controller_test.rb | 17 +
.../test/controllers/containers_controller_test.rb | 15 +
.../pipeline_instances_controller_test.rb | 8 +-
.../test/integration/application_layout_test.rb | 97 ++-
apps/workbench/test/integration/jobs_test.rb | 65 +-
apps/workbench/test/integration/logins_test.rb | 2 +-
.../test/integration/pipeline_templates_test.rb | 2 +-
.../test/integration/user_profile_test.rb | 4 +-
apps/workbench/test/integration/websockets_test.rb | 9 +-
apps/workbench/test/unit/work_unit_test.rb | 94 +++
...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-one-target.sh | 3 +
build/run-build-packages.sh | 39 +-
build/run-library.sh | 3 +-
doc/_config.yml | 1 +
doc/_includes/_install_postgres.liquid | 22 -
doc/_includes/_install_postgres_database.liquid | 17 +
doc/_includes/_install_redhat_postgres_auth.liquid | 11 -
doc/_includes/_install_ruby_and_bundler.liquid | 6 +-
...e_python27_sc.liquid => _note_python_sc.liquid} | 4 +-
doc/install/install-api-server.html.textile.liquid | 33 +-
.../install-compute-node.html.textile.liquid | 21 +-
doc/install/install-keepstore.html.textile.liquid | 78 +-
...nstall-manual-prerequisites.html.textile.liquid | 2 +-
doc/install/install-postgresql.html.textile.liquid | 62 ++
.../install-shell-server.html.textile.liquid | 40 +-
doc/install/install-sso.html.textile.liquid | 49 +-
.../install-workbench-app.html.textile.liquid | 3 +-
doc/sdk/cli/install.html.textile.liquid | 4 +-
doc/sdk/python/sdk-python.html.textile.liquid | 18 +-
doc/sdk/ruby/index.html.textile.liquid | 4 +-
docker/jobs/Dockerfile | 2 +-
sdk/cli/bin/arv | 45 +-
sdk/cwl/arvados_cwl/__init__.py | 790 ++++-----------------
sdk/cwl/arvados_cwl/arvcontainer.py | 207 ++++++
sdk/cwl/arvados_cwl/arvdocker.py | 43 ++
sdk/cwl/arvados_cwl/arvjob.py | 317 +++++++++
sdk/cwl/arvados_cwl/arvtool.py | 37 +
sdk/cwl/arvados_cwl/done.py | 40 ++
sdk/cwl/arvados_cwl/fsaccess.py | 65 ++
sdk/cwl/arvados_cwl/pathmapper.py | 55 ++
sdk/cwl/arvados_cwl/runner.py | 122 ++++
sdk/cwl/setup.py | 2 +-
sdk/cwl/test_with_arvbox.sh | 29 +-
sdk/cwl/tests/{test_job.py => test_container.py} | 126 ++--
sdk/cwl/tests/test_job.py | 9 +-
sdk/cwl/tests/test_submit.py | 87 ++-
sdk/go/arvados/api_client_authorization.go | 12 +
sdk/go/arvados/client.go | 89 ++-
sdk/go/arvados/client_test.go | 70 ++
sdk/go/arvados/container.go | 54 ++
sdk/go/arvados/error.go | 43 ++
sdk/go/arvados/keep_service.go | 9 +
sdk/go/crunchrunner/crunchrunner_test.go | 40 +-
sdk/go/dispatch/dispatch.go | 239 +++++++
sdk/go/keepclient/collectionreader.go | 2 +-
sdk/go/keepclient/support.go | 19 +-
sdk/python/arvados/commands/ws.py | 4 +
sdk/python/arvados/events.py | 1 +
sdk/python/arvados/keep.py | 282 ++++----
sdk/python/tests/test_keep_client.py | 60 +-
services/api/Gemfile.lock | 3 -
services/api/app/middlewares/rack_socket.rb | 4 +
services/api/app/models/collection.rb | 30 +-
services/api/app/models/container_request.rb | 91 ++-
services/api/app/models/user.rb | 4 +-
services/api/config/application.default.yml | 10 +
services/api/config/database.yml.example | 5 +-
services/api/lib/eventbus.rb | 149 ++--
.../test/fixtures/api_client_authorizations.yml | 9 +-
services/api/test/fixtures/container_requests.yml | 99 +++
services/api/test/fixtures/containers.yml | 109 ++-
services/api/test/fixtures/job_tasks.yml | 11 +
services/api/test/fixtures/jobs.yml | 4 +-
services/api/test/fixtures/links.yml | 45 ++
services/api/test/fixtures/pipeline_instances.yml | 10 +-
services/api/test/fixtures/users.yml | 16 +
services/api/test/integration/websocket_test.rb | 14 +-
services/api/test/unit/collection_test.rb | 35 +
services/api/test/unit/container_request_test.rb | 420 ++++++-----
services/api/test/unit/user_test.rb | 10 +
services/api/test/websocket_runner.rb | 11 +-
.../crunch-dispatch-local/crunch-dispatch-local.go | 267 +++----
.../crunch-dispatch-local_test.go | 117 ++-
.../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 412 ++++-------
.../crunch-dispatch-slurm_test.go | 189 +++--
.../crunch-dispatch-slurm/crunch-finish-slurm.sh | 20 -
services/crunch-dispatch-slurm/squeue.go | 114 +++
services/crunch-run/crunchrun.go | 328 +++++----
services/crunch-run/crunchrun_test.go | 196 ++---
services/crunch-run/logging_test.go | 6 +-
services/crunchstat/crunchstat_test.go | 2 +-
services/datamanager/collection/collection.go | 12 +-
services/datamanager/collection/collection_test.go | 14 +-
services/datamanager/keep/keep.go | 20 +-
services/datamanager/keep/keep_test.go | 4 +-
services/datamanager/summary/pull_list_test.go | 50 +-
services/datamanager/summary/summary_test.go | 24 +-
services/datamanager/summary/trash_list.go | 2 +-
services/datamanager/summary/trash_list_test.go | 30 +-
services/keep-balance/balance.go | 16 +-
services/keep-balance/balance_test.go | 4 +-
services/keep-balance/collection.go | 11 +-
services/keep-balance/main.go | 8 +
services/keep-balance/usage.go | 17 +-
services/keepproxy/keepproxy.go | 15 +-
services/keepproxy/keepproxy_test.go | 58 ++
services/keepstore/azure_blob_volume.go | 2 +-
services/keepstore/keepstore.go | 10 +-
services/keepstore/s3_volume.go | 4 +-
services/keepstore/trash_worker.go | 6 +-
services/keepstore/trash_worker_test.go | 2 +-
services/keepstore/volume_generic_test.go | 37 +-
services/keepstore/volume_unix.go | 7 +-
services/keepstore/work_queue_test.go | 2 +-
.../arvnodeman/computenode/driver/__init__.py | 4 +
tools/arvbox/bin/arvbox | 2 +-
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 14 +-
tools/arvbox/lib/arvbox/docker/Dockerfile.dev | 4 +-
.../service/crunch-dispatch-local/run-service | 2 +-
162 files changed, 5792 insertions(+), 2788 deletions(-)
create mode 100644 apps/workbench/app/models/container_work_unit.rb
create mode 100644 apps/workbench/app/models/job_task_work_unit.rb
create mode 100644 apps/workbench/app/models/job_work_unit.rb
create mode 100644 apps/workbench/app/models/pipeline_instance_work_unit.rb
create mode 100644 apps/workbench/app/models/proxy_work_unit.rb
create mode 100644 apps/workbench/app/models/work_unit.rb
create mode 100644 apps/workbench/app/views/container_requests/_show_log.html.erb
create mode 100644 apps/workbench/app/views/container_requests/_show_status.html.erb
create mode 100644 apps/workbench/app/views/containers/_show_log.html.erb
create mode 100644 apps/workbench/app/views/containers/_show_status.html.erb
create mode 100644 apps/workbench/app/views/work_unit/_component_detail.html.erb
create mode 100644 apps/workbench/app/views/work_unit/_progress.html.erb
create mode 100644 apps/workbench/app/views/work_unit/_show_child.html.erb
create mode 100644 apps/workbench/app/views/work_unit/_show_component.html.erb
create mode 100644 apps/workbench/app/views/work_unit/_show_log.html.erb
create mode 100644 apps/workbench/app/views/work_unit/_show_outputs.html.erb
create mode 100644 apps/workbench/app/views/work_unit/_show_status.html.erb
create mode 100644 apps/workbench/test/controllers/container_requests_controller_test.rb
create mode 100644 apps/workbench/test/controllers/containers_controller_test.rb
create mode 100644 apps/workbench/test/unit/work_unit_test.rb
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
delete mode 100644 doc/_includes/_install_postgres.liquid
create mode 100644 doc/_includes/_install_postgres_database.liquid
delete mode 100644 doc/_includes/_install_redhat_postgres_auth.liquid
rename doc/_includes/{_note_python27_sc.liquid => _note_python_sc.liquid} (62%)
create mode 100644 doc/install/install-postgresql.html.textile.liquid
create mode 100644 sdk/cwl/arvados_cwl/arvcontainer.py
create mode 100644 sdk/cwl/arvados_cwl/arvdocker.py
create mode 100644 sdk/cwl/arvados_cwl/arvjob.py
create mode 100644 sdk/cwl/arvados_cwl/arvtool.py
create mode 100644 sdk/cwl/arvados_cwl/done.py
create mode 100644 sdk/cwl/arvados_cwl/fsaccess.py
create mode 100644 sdk/cwl/arvados_cwl/pathmapper.py
create mode 100644 sdk/cwl/arvados_cwl/runner.py
copy sdk/cwl/tests/{test_job.py => test_container.py} (62%)
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
create mode 100644 sdk/go/dispatch/dispatch.go
create mode 100644 services/api/test/fixtures/job_tasks.yml
delete mode 100755 services/crunch-dispatch-slurm/crunch-finish-slurm.sh
create mode 100644 services/crunch-dispatch-slurm/squeue.go
via 61dbc4445159c9140b0744bf5526ce0f71f4f374 (commit)
via ec7f4b1a20ce6f45d6dbd58e531210e8039009d2 (commit)
via a74c81b035c67d299e2a7298f8db3d368a578510 (commit)
via 3546fd8b7c50ba7a1f4c088f4ad3ab5392cdf548 (commit)
via b7569de781d06b65f2daf2b269ff185eb2ed13c1 (commit)
via f9e3d32c92920a806d50548dbb9b6c0aab7d8c54 (commit)
via 15c918a67ceda31bde38cab75736d89bd015476a (commit)
via 984e8475628cc18eaf600bea2bbdc7ce228706e8 (commit)
via c36840670ed16bc74a260e1c047ed70f03dc5696 (commit)
via db4eb863a36acbacde64f7d356065b3b9cbfb342 (commit)
via 5f164d87da5241099d545b15ad537be69243a200 (commit)
via 5559c86b1a6bba1d3a1dbdb633ac377f54ed14b0 (commit)
via 2a30f6a162a59ff5a75b9fcdef4913baeeae6a1e (commit)
via 7f5e5b88c9161cbec69725108e438aa1532acaf5 (commit)
via afabb6c30c449d6139aec344d0912fc2645e2e89 (commit)
via 8c4542afc387211a36cc90f8085f229ff314854e (commit)
via 1263d931ed5043cb7f71dcfdb0ec8099b6f68501 (commit)
via 5b0d660909c34b4b94ae2a9d45dccf2d5400fc7b (commit)
via 212c20e55437a5e67482e1db971d0d826591e856 (commit)
via 8ffcc8cc6847919afbb16944012e4ada3eff5419 (commit)
via 2f1d6ce89425424a57e6ed041b9a7d50a826eba3 (commit)
via a9f1adf0a3e2df296ce0a8c0a1d735b7e5044baa (commit)
via 966acb6ce28cdb4b0d30bdcd238cbbce73deaa87 (commit)
via 1b44d67f865d92e1610fa283e7fa27cf91ed6a1d (commit)
via 6c0588485bc29736929ebb6997c8fe6879dbf9eb (commit)
via e51500d3aab95467d15f82f377737328498e8619 (commit)
via 5d61f80a86d4d52ca87e43b0a082dbcab02699e0 (commit)
via 01ea0e9faa0b29ef747699f7f4b728d4e888ef83 (commit)
via fdda56c99dbf581d7a09cebd28a16dceee2f8f02 (commit)
via 53e5b13980ce3bfc1b898482696310e4ed8a9c54 (commit)
via 5bcb3cee7d38123480cccc84a22a451ea17f2ae9 (commit)
via ce5abd0b4f93b2dfded9d02f8e01ea0505ae5128 (commit)
via 0ea1f67f70f942c4732f2269e31c3ddb7d63fc9e (commit)
via bef2f8e7bc3bd70b286971885294e5da2729da7b (commit)
via 9ccdea630f00035e96eb2bac539a4bd0d3df196d (commit)
via 9e5d7b0dc43a85fc03740b39611545f470a63eb8 (commit)
via 446a10bce8c5927fc506e0e9f3fc825a1849ea15 (commit)
via dea15524cdbe9f791722fc956e939ce593e450b6 (commit)
via 09d1049dab1fcfbdad8332f1d74a091aebfa0e66 (commit)
via 7b877535b3ef1cb38882b2f1926aaa79d9732e31 (commit)
via ff6cb85a77a557def55550b8d34355979bddbdeb (commit)
via e4b1a745a97af1d65bb1e03f770b34457003eae2 (commit)
via 6f1c0e1dd16f53ce4fb7e8785a130e5f588500e5 (commit)
via 691a08fd486e53ce656ae20fea84c2b3ec1a1088 (commit)
via 4744bcbfe19d352daa915a4249aacd4ccabaa505 (commit)
via ffdc34b50c159573ffeeb836fb405890e4062d01 (commit)
via 8bb8e4cfe39e6b44142adca4721ba29467376e1d (commit)
via f17a26ca512ae0083ea5ad608ad6cfbb7fd247ee (commit)
via cd206dc9f38a5d6c1cd115b53cb77be071edd57c (commit)
via fbc5ee7656bb337f15b3b2b7c88473f29f40c8b0 (commit)
via c9b5db991553e3a6eb6ec1f268e94f4a7b2a64d0 (commit)
via fa615bfa6748a0b552c4e3a33be1921f0760664e (commit)
via 7cd03709ba594237b9cf88afac76d39f28011b35 (commit)
via bb48c3155b90e4bf1994a66b8fab858f12a1f4f4 (commit)
via 22e066d43cb09beb21c4cd5b12a787b81a00f97e (commit)
via 9a44fb9de57a2f44347aecd26928eee03ea3c60c (commit)
via 27b18bf9b168319660bdde4632ac4c3f359666d6 (commit)
via e60deecc14d9ac114a54747f7d3baf83ae6bdd3e (commit)
via f5bd38d4b168540ddb0e33db9e35a51ec5d60c17 (commit)
via a7d2ff32ec742b8feb38898694f1925b1e45c6eb (commit)
via 6d910ff1327859e0eae9eed474ee360fb9c5894b (commit)
via 2e5f6787e7b37a47247035803fba41354cbdabdd (commit)
via 92b530ffbb5022192f00977183e591ae81240347 (commit)
via 529dbc0b24f9dc06c3af1abaadd97374419d9507 (commit)
via 4aaa1f6aeae33dc353ea3a70f901065b4f694fed (commit)
via adfc2c563d47c0eb70985245a1a7c4df004d7aa0 (commit)
via bfdf3d5b0ab2b2747321f3d5e2fc3e18f165fefd (commit)
via 1f2bc01d1b9ad8aa742a8bec006d3f15e184dd5d (commit)
via 6617a2ba4323d2f47566c89961763625fce2e1ca (commit)
via 573d4de8f5471e071f8b1f72646cc02fd82c6bd1 (commit)
via 5862c01a952d410b1237dc2a4a86cb844652a8d0 (commit)
via 2435a72a0a0c0058d2825ea0840836e95ebe5f25 (commit)
via b507fa11a9acfd15217d0972b0d6b41fd41b9958 (commit)
via 032239408242c641b08df74f6a91984cbab610cd (commit)
via a2bed2f92f8aab7f41fef7b6cbd5d377fc2a78d5 (commit)
via 3a0ae61f658a7473219991bd3279b492b24ed875 (commit)
via 49043f14cb72a6eb5825aea529e3477b73e297c7 (commit)
via 6c43be47cb3756a0e6ffc924572259d1a1c8f2c3 (commit)
via 92ce0b4ffb51c957ddc0a6e36f7dfba2c819b38f (commit)
via bea445d5d02adb035a126582e5c0358ec5db5c75 (commit)
via a82231ef8bdf251a5f243461a4fafaf3b3ad5579 (commit)
via ad8c74a419972e173bd5fd75595d9893b58fc154 (commit)
via 01a3a3cd88f56635a0f5d7938c70a3884c6b85bb (commit)
via b70924ee743d537a0c2c31202b9a730dea555856 (commit)
via 6cd1dd7a2a55a80dd207b70fbb10a72e68bc7ea4 (commit)
via 76be616a8a65a6c574026583c462640dcc9e706f (commit)
via ed309f2bd237c32565879dbb1e9c42ea5caba61d (commit)
via 1478093ebd5749e67c179cb8c3391870edd13c32 (commit)
via ad272d78c6238b3c5cc250e643b8fda632b11d70 (commit)
via 4441a843f6c02f5434d05db7e1bae3cbc8683d69 (commit)
via ee89a901aa93fa07f6aecde91a2f76a7a6067d5e (commit)
via a7f2a6121f1802322dc94adf7bd0fb49d42b22ef (commit)
via f6d8e101a642138a19ed5303f31653f3becb81da (commit)
via 0af7e7b2ab33ad8766c4c0b537070dfddbadf37c (commit)
via 665984cf6e1bd9091e61d71b1dd2602b5bb54223 (commit)
via e7d49ab46462902a98d812b69d7257d837f85e90 (commit)
via f00c2849c5cdbe179d61bcaa1374d355844c2fae (commit)
via cbd67fc6ba667bc27ca7e885145a6e34e5596f37 (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 4a6b74c22201ceac36797b7722d52407eec63536 (commit)
via 2cd1c3ed705e639fb9e4ef067a32b278a6d3d4ee (commit)
via 0ac69cee6889be8337d147a75829596f19075fa5 (commit)
via f32e1aadda3cc2cb89ee341e24cc312f42d37505 (commit)
via a340b9c191733087722cd4203bf0b6b76f60cbec (commit)
via 3f3b57c67af8967d466cf69b4c8e41885eee13c8 (commit)
via 2d5ef50536851f8d190675a3bd74ee7567713ee0 (commit)
via e4c30dbf271df0633efce61c630a29c89bc43bff (commit)
via ce7d731ac808245bd44d1999001a1e9de8f0e4db (commit)
via c12be4d7070ee3de978c1426c68071fb53f1dabd (commit)
via 0fa28b7feceb285f5d7148e26f42729692115b73 (commit)
via 04349db8d176f4a305368ad5abc551586acd24a1 (commit)
via 4ad0992515fd02eedcb11d3c52445e12e1ffa7a7 (commit)
via b3b64d046641ccc39e4f4d6fab85a8b831732d51 (commit)
via 2ce42bc1b881972753b77d4e3f4de8355d947063 (commit)
via 4d697d3c92cb903ca24b7ce2f30573b2aa52e9a1 (commit)
via 2bf563e0e007fc4252c7a7c4db06f3c775b72320 (commit)
via 1e8ce3e1d472c2497172c602a2400cd7a7672e9b (commit)
via 9e9edda09864405897ec816c9a080c5545642d11 (commit)
via 5ce935688c2bac3d4ff779db5659366722f0ff54 (commit)
via 4d89b138dff0f1bcf1c867d529aff599fcc0cda2 (commit)
via 65721c02e81f29cb8e40aab4b3d35bebc4f23cc6 (commit)
via 1c36703db22a4695f0a2aebaa3ffbd5d8d64997f (commit)
via d4973e18ed92e3bcc0cb8b2020649148240ce9c0 (commit)
via b0e9a800435e6231317e5123c9b6a1b5b6397a5e (commit)
via 175c0b1f257257cdf0143d727cf928986fb25871 (commit)
via 84b538b627cba20558e0a52f3efe73eec90a46fe (commit)
via bb73dc995ffd3fcc05ff579f2aa0f8bf9b479f4a (commit)
via 8bfd0bd237a017b2e5c7cdcd69e677b5b111d558 (commit)
via e016b28393b74cd30a78ebe03eca7e37a51fefd3 (commit)
via c3e2a93527a137fbeb3e2bb13c5ab344a95ab47f (commit)
via 427da80092302506bbf5f97b30e9e2e927e06596 (commit)
via bd872ed1fbda80e4e20c2b1e916d210f670afe4e (commit)
via 62b3629a76473ae3846860362923b2e180c42e08 (commit)
via d7d46dfe9b8be649e7bfdd3f65a0f2313b7597d3 (commit)
via 5604e411dec23b6ebaa9f52b4994ed7c30182f92 (commit)
via 5a3935887ab7ef09d44a38cceb97b8a8346713c7 (commit)
via 2c4ff054b533c62ecdb269963d3ab0af20d2df8b (commit)
via 3c4bcfbe8611878bff64778180f84ad93829e6b2 (commit)
via 3655323be70c758c3c47460598a9644c45a3ee08 (commit)
via 4d95f6cc422bc4dea97da79bbfbb2e7809ee20fc (commit)
via 2efdb0e205abe63c5ca777fc4dacca65192e5dd3 (commit)
via 548e0c54db524cb7317850d4dfd8f3ee0b93cdb0 (commit)
via a95f899d7ac84f29b3d019aa410d265bb40833e5 (commit)
via 252a5f7f290567f7cbcc9897a879c0a7ebe64e90 (commit)
via 5390a3481986934e240bc4d663ab2010992950e2 (commit)
via 8630c5472c508b37c26751768c568e429652bb15 (commit)
via 1f18112293b02114b4dc5b279f18b15e4b9a6655 (commit)
via d519091d2d64a859d0b786df7adadeeb1d4ae958 (commit)
via d10c79192b333191796d949841ec792e61a6006c (commit)
via b7dbb80a0745d5daec4b3a04b6c9e9e19732cb3e (commit)
via b7db50d724c258c89da5b5d7b005de2f04d92653 (commit)
via 6d940c5e6940a1dca97989c47e67c33d20a4d050 (commit)
via b0e7987af4ac6ae6ea3250e9dafa4ecf58544770 (commit)
via 1650c9eec24fea204cdbf5229ed61d564b48cdb9 (commit)
via abf6347cc1d56bc448e993249c9d6359ba60c606 (commit)
via 8bbc3c48c7211b8bf497edcb0816a4b9bdd94d4c (commit)
via f526141fa776df068d011093ccb89f31f52e69be (commit)
via 18db9a81749b63725ff2a5a13a11442cdd054ad9 (commit)
via e02bf11203b85a6baac31584b9ba451c92be21b3 (commit)
via c2a1512988551e03ce4270f9e936edde37f6c1b8 (commit)
via c554b80187e6e076cbf147b1abb34ed9eb36ce93 (commit)
via c400bf1e7a52d5557c2031bdf2c8de9957425577 (commit)
via e168c00d6dd4f6524089998debede1abe811c892 (commit)
via 55febaa6856eb2d77657edd685aaae78bba0ec82 (commit)
via 139200027a3192260b5ea7c2d0c93a8eb5f8eb7e (commit)
via c405873d87e0764acf3855c559c85fa6d7a63cfb (commit)
via 10e7635b3627c7a70f9ed4bc5adee92854a3a274 (commit)
via 8974e10fe2dbf643861f75cffa0fba9a6db972c8 (commit)
via aface0b74e6b3cfaaa8d773218a5ada423a7654b (commit)
via d1d4aba8c3eb7e3b605639a4b02cb9d26c033ad2 (commit)
via d45be86b354adec485504bfc09f41e0e22241f34 (commit)
via 3d60a5dcfb6765b223d224dda3980226230464d0 (commit)
via ebb21c7daa50d4101b34647b0e961e4f470a5b0b (commit)
via a903ecabc5b8d1f33c0f1a9338525c147c75b35a (commit)
via 26d4cf61346b77ef06556f15b539d532a076d7fb (commit)
via 6db539443f98f6f56935f55aa611f5ed29622e19 (commit)
via e7217857f942d11bdca90c58cf22f8f18c9d29df (commit)
via 6b2f232c3d73a023d64112c609a28c8ff9cc27de (commit)
via 94d3f4ba358ac5fef765fb7574d6823ff8c335aa (commit)
via f9def1f7abc8ad6720d9b88ec541b00a03ff1d0e (commit)
via bb10b7777ed6db229fbb35e6a829bec4e8efcd23 (commit)
via 5cf8c18e735bb15da3f131e7ae57bb4b222bb4ed (commit)
via d77c4cc58d393c48ce46b987f6eada7c7cc381c6 (commit)
via f9ac3734498a72657adf82004d012ebfae87f5cd (commit)
via e6cb66913899a35cda5a5a8df26869cb29c0ebcd (commit)
via e62729494da8bcd9fc05a3e4b0b853205892bfeb (commit)
via 35c9bd48e78ba49d0ecdb5ea229d1b2f75157f79 (commit)
via 8a56164a8a9d3c7b3b58df77d1e5aa3f1d6cad12 (commit)
via c5a633744aa99fb7c55f96ad69fd47a1c14d171c (commit)
via cab53a136beb1c38d9c35a6a4b1e3d664f043e8d (commit)
via 20d912bf005dcb170048a1c9167d484c91a1f8e6 (commit)
via 6805fb7e020f99402aa84db45e975b3062f28251 (commit)
via 7027a116acc02d8c2968d7a6f269172b45f0cd04 (commit)
via 3ae9a789410e93eeb31ca5670c17a6d03d77f608 (commit)
via 0a98952530fb465fa31566fa5e0192bea9fc16e4 (commit)
via 79ad282774b6afb9a48445ac3d12d7bb5615e4eb (commit)
via ee65176b19d66ea3b862a65590f9f819c5e69a96 (commit)
via 2c3500ce771ff9a7cc63a0c92424def877798635 (commit)
via 5cbcd7b2923a9c4e58189dbaa0b482e357291c57 (commit)
via a31816b03c8249178d51621524f05437f5f9478a (commit)
via a0187bc7327e7abfc759a43cee81cb77fe063bf0 (commit)
via 3a3910fdc8a5003c182f68e3423c96327a136175 (commit)
via bbbf60994bf4fc2733d3395b870359b5a96df227 (commit)
via 9122f814b4c22828f64d82c48409dd4cc6cacc3f (commit)
via 4153cb6cfad920ed0b1a4b818d3bcc8de492d134 (commit)
via 17e79aa5b26b8c0b3228247451172999ad81baff (commit)
via a4f061a5bf48f0335238da72b8d03ca349fa7553 (commit)
via 2d7b22fd7d905e4fa44452775d9db6a06a50da8c (commit)
via 7f5a540ea4b1bad1a7b1646543e0cd48ff2af7ba (commit)
via f3658ececac430166ee9766be1deee6a61153d0f (commit)
via 7afa73aff577d3c2c066c21586a44a94c8731710 (commit)
via fe3f19bb8f0a684de9c5a7d1f7c619943d0daca0 (commit)
via ae3a047bed172be701e3d2aa2d566e9800552d85 (commit)
via 212fa4898c594211217444b20ef629157813bc4a (commit)
via f6400fca6dc60055b613b0e3dc3c8422b7af6391 (commit)
from 7e60563ccd6a241f05271f1b558a43f01e79dedc (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 61dbc4445159c9140b0744bf5526ce0f71f4f374
Merge: 7e60563 ec7f4b1
Author: Ward Vandewege <ward at curoverse.com>
Date: Fri Jul 1 17:49:08 2016 -0400
Merge branch 'master' into 9352-many-nodes-make-workbench-faster
Conflicts:
apps/workbench/app/views/projects/_show_dashboard.html.erb
diff --cc apps/workbench/app/views/projects/_show_dashboard.html.erb
index 45eaa61,6dfa1bc..f53e909
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@@ -130,24 -107,41 +107,41 @@@
</div>
<div class="col-md-6">
- <% nodes = Node.filter([["ip_address", "!=", nil]]) %>
- <% nodes = Node.filter([["last_ping_at", ">", Time.now - 3600]]) %>
++ <% nodes = Node.filter([["last_ping_at", ">", Time.now - 3600],["ip_address", "!=", nil]]) %>
<div class="panel panel-default" style="min-height: 10.5em">
- <div class="panel-heading"><span class="panel-title">Compute and job status</span>
- <span class="pull-right">
- <%= link_to jobs_path, class: 'btn btn-default btn-xs' do %>
- All jobs <i class="fa fa-fw fa-arrow-circle-right"></i>
+ <div class="panel-heading"><span class="panel-title">Compute node status</span>
+ <span class="pull-right compute-node-actions">
+ <% if current_user.andand.is_admin %>
+ <span>
+ <%= link_to nodes_path, class: 'btn btn-default btn-xs' do %>
+ All nodes <i class="fa fa-fw fa-arrow-circle-right"></i>
+ <% end %>
+ </span>
<% end %>
+ <span>
+ <%= link_to jobs_path, class: 'btn btn-default btn-xs' do %>
+ All jobs <i class="fa fa-fw fa-arrow-circle-right"></i>
+ <% end %>
+ </span>
</span>
</div>
- <div class="panel-body">
+ <div class="panel-body compute-node-summary-pane">
<div>
<%= render partial: 'compute_node_summary', locals: {nodes: nodes} %>
- <div style="text-align: center">
- <a data-toggle="collapse" href="#compute_node_status">Details <span class="caret"></span></a>
- </div>
+ <% active_nodes = [] %>
+ <% nodes.sort_by { |n| n.hostname || "" }.each do |n| %>
+ <% if n.crunch_worker_state.in? ["busy", "idle"] %>
+ <% active_nodes << n %>
+ <% end %>
+ <% end %>
+ <% if active_nodes.any? %>
+ <div style="text-align: center">
+ <a data-toggle="collapse" href="#compute_node_status">Details <span class="caret"></span></a>
+ </div>
+ <% end %>
</div>
<div id="compute_node_status" class="collapse">
- <%= render partial: 'compute_node_status', locals: {nodes: nodes} %>
+ <%= render partial: 'compute_node_status', locals: {nodes: active_nodes} %>
</div>
</div>
</div>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list