[ARVADOS] updated: 42db5188e104e94ce73d743edaafb1c2053e3c0c
git at public.curoverse.com
git at public.curoverse.com
Fri Feb 12 16:52:46 EST 2016
Summary of changes:
apps/workbench/Gemfile.lock | 3 -
.../app/controllers/application_controller.rb | 36 +++----
.../views/application/_projects_tree_menu.html.erb | 2 +-
.../test/controllers/projects_controller_test.rb | 2 +-
backports/python-gflags/fpm-info.sh | 1 +
crunch_scripts/crunchutil/subst.py | 2 +-
crunch_scripts/run-command | 17 +++-
.../install-crunch-dispatch.html.textile.liquid | 5 +-
sdk/cli/bin/crunch-job | 44 ++++++---
sdk/python/arvados/events.py | 63 ++++++++----
sdk/python/setup.py | 2 +-
services/api/Gemfile | 2 +-
services/api/Gemfile.lock | 4 +-
services/api/app/models/arvados_model.rb | 4 +
services/api/lib/crunch_dispatch.rb | 5 +-
services/api/lib/load_param.rb | 26 ++++-
.../api/test/functional/arvados/v1/query_test.rb | 68 +++++++++++++
services/fuse/arvados_fuse/command.py | 11 ++-
services/fuse/arvados_fuse/fusedir.py | 24 +++++
services/fuse/tests/test_command_args.py | 28 +++++-
services/nodemanager/arvnodeman/clientactor.py | 20 ++--
.../nodemanager/arvnodeman/computenode/__init__.py | 3 +
.../arvnodeman/computenode/dispatch/__init__.py | 108 ++++++++++++++-------
.../arvnodeman/computenode/dispatch/slurm.py | 1 +
.../arvnodeman/computenode/driver/__init__.py | 8 +-
services/nodemanager/arvnodeman/daemon.py | 103 +++++++++++++-------
services/nodemanager/arvnodeman/jobqueue.py | 3 +-
services/nodemanager/arvnodeman/launcher.py | 58 +++++------
services/nodemanager/arvnodeman/nodelist.py | 5 +-
services/nodemanager/tests/test_clientactor.py | 4 +-
.../nodemanager/tests/test_computenode_dispatch.py | 21 ++--
services/nodemanager/tests/test_daemon.py | 1 +
.../crunchstat_summary/chartjs.py | 20 +++-
.../crunchstat_summary/command.py | 3 +-
.../crunchstat_summary/reader.py | 80 +++++++++++++++
.../crunchstat_summary/summarizer.py | 97 ++++++++++++------
.../tests/logfile_20151204190335.txt.gz.report | 24 ++---
.../tests/logfile_20151210063411.txt.gz.report | 13 ++-
.../tests/logfile_20151210063439.txt.gz.report | 13 ++-
39 files changed, 681 insertions(+), 253 deletions(-)
create mode 100644 backports/python-gflags/fpm-info.sh
create mode 100644 services/api/test/functional/arvados/v1/query_test.rb
create mode 100644 tools/crunchstat-summary/crunchstat_summary/reader.py
via 42db5188e104e94ce73d743edaafb1c2053e3c0c (commit)
via 2872b6deb0d9e3d5fbfe0a172aa87949980dfe6f (commit)
via 292d026aecbc6b7e1bd12a6c5db8cc905318a992 (commit)
via 2adcde44af5b170b9c602ffbc3d035bd92b4f05f (commit)
via d46ebdc7f1aa7d66d576ec3506edae42181c4e30 (commit)
via 308fddf4affe8b511c1617230048a554bc19f996 (commit)
via 0e81ce46c3f8d0b2e404303878c4d203e3523aad (commit)
via 495a485ff8e7b8c548b943da10c6acfe3eb98165 (commit)
via d944cda7fc56ff31bc1bd1200648785e43bf0405 (commit)
via 7c893926186fec34727f29628dd587ae3cbe86a6 (commit)
via 6d788bb6ab248cf5aef02a049912fbcd42da514f (commit)
via e1385430ac8a650aca04e95abc451d81c2c88cf5 (commit)
via aabdbefd374565d5203d414f46eadc8345c022bf (commit)
via 49dbada3eb269212cdfb38bcae07781e141453fc (commit)
via 5522d7db6279de7b48fbb734107f7fcd4fed5152 (commit)
via 93fbce38ba033404b86236101e5491fa89e6abd1 (commit)
via 3360352ddbcbfa6d89e80f4aae0e20eddd96daf8 (commit)
via fdc9a9308c646d23ec50073833f141ceebf78613 (commit)
via 2b324ca45515fbf079afb15db821f437ee6b64a5 (commit)
via 74bfe6e5794b42d3158d9358245802e73942b909 (commit)
via d1c72b300d50f071106a320a807f465c251a812e (commit)
via baeb7dbe5929012dea22985b11ae4c5584f76891 (commit)
via 19199a75e41004ea776622c305c3ca43e5367bf2 (commit)
via ddd02b0a536cbc0e80b77df43939e30f294126b5 (commit)
via 090b515aa10dba597b20a96797f17688f582a529 (commit)
via fcbb743e3de63e93280f2fbeedea49f98430d26f (commit)
via e8b7fbbd711836c59824327364e15ef2253a5848 (commit)
via 1fc6d7713baabfe85b49191e156b6c093d22b69f (commit)
via d4807ea755bcd122388189815b0b6d5aaa295509 (commit)
via 3f5b70e78c4008e0de876e53fc7fbbc0671a6937 (commit)
via 1293a55ede38d16119b04a6584ca9da143ea3725 (commit)
via 6c950260b253d28e78579b493c8eb3eabe0add11 (commit)
via d7e8f7c787b7706937f95c3ed2a5086616d48514 (commit)
via 3e7037e6383f57b0d1b4b627cd9feb27f05af13d (commit)
via 5bda5bf3aedc0621abeed901a608adb7db6030e6 (commit)
via f6bb371a170d0a74db6abf9df0f65aabe08d7cf9 (commit)
via a13c14cfc7fabe4f4da48edd57a086d2d8953a03 (commit)
via 78b9f61dcab9bd571952b8c9e8052b643588c52b (commit)
via 66da04e142bb80ff25d65900292bf99c7e4252f2 (commit)
via 4186924dbc103d080c47ae85bcfcd38d87314767 (commit)
via 48369a1e78683cec26b7154d5edc5f3450fec245 (commit)
via 3a2802166901386eba4c3bc9bf877a18346ba03c (commit)
via b63c1041dd34fe496920fd035249e50edc88b095 (commit)
via 45f37fe38bd3cb7ca1ff9a7c47791ec73888f383 (commit)
via 8417bf754051966915b93c362624ebdcd492d660 (commit)
via 64e0a60330d73309c02e75d012249a28a32e1b9d (commit)
via 0d6070d3b62fc367dbb02e8ead5fe25dce012156 (commit)
via ea5a4de11a0f379c6fa78be288bc403da53995a1 (commit)
via 8709ef45c968e79b5e5978759484b994d4789aea (commit)
via fd5a11b21af83870c4122afdf94844dd4cf63cc6 (commit)
via cda9a7d3e3601a7a8bb721261c5b26210e9f629f (commit)
via ca4e92183dfca9f226898790a09239935e17eba9 (commit)
via be2197781a206ba7cbf5bbfbf61a70375fb10d68 (commit)
via e9901a3f94eab93f9482b7cb3d7e2c1b50216f08 (commit)
via 3a8714e6fcf41c46d1fde0a6a3e4beb1367d181d (commit)
from 310f6c81aad96a063f798d5940853dfad3409bba (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 42db5188e104e94ce73d743edaafb1c2053e3c0c
Author: radhika <radhika at curoverse.com>
Date: Fri Feb 12 16:50:34 2016 -0500
8183: while displaying "my projects" tree, just show only the user's projects and omit shared projects
even when there are no more than 300 projects to avoid confusion.
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 696e821..9d38723 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -836,30 +836,20 @@ class ApplicationController < ActionController::Base
# build the tree using only the top 200+ projects owned by the user.
# That is: get toplevel projects under home, get subprojects of
# these projects, and so on until we hit the limit
- def my_wanted_projects page_size=100
+ def my_wanted_projects user, page_size=100
return @my_wanted_projects if @my_wanted_projects
- all = Group.filter([['group_class','=','project']]).order('name').limit(page_size)
- if all.items_available > page_size*3
- @total_projects = all.items_available
- from_top = []
- uuids = [current_user.uuid]
- while from_top.size <= page_size*2
- current_level = Group.filter([['group_class','=','project'],
- ['owner_uuid', 'in', uuids]])
- .order('name').limit(page_size*2)
- break if current_level.results.size == 0
- from_top.concat current_level.results
- uuids = current_level.results.collect { |x| x.uuid }
- end
- @my_wanted_projects = from_top
- else
- if all.results.size == all.items_available
- @my_wanted_projects = all
- else
- @my_wanted_projects = Group.filter([['group_class','=','project']]).order('name')
- end
+ from_top = []
+ uuids = [user.uuid]
+ while from_top.size <= page_size*2
+ current_level = Group.filter([['group_class','=','project'],
+ ['owner_uuid', 'in', uuids]])
+ .order('name').limit(page_size*2)
+ break if current_level.results.size == 0
+ from_top.concat current_level.results
+ uuids = current_level.results.collect { |x| x.uuid }
end
+ @my_wanted_projects = from_top
end
helper_method :my_wanted_projects_tree
@@ -872,11 +862,11 @@ class ApplicationController < ActionController::Base
return @my_wanted_projects_tree if @my_wanted_projects_tree
parent_of = {user.uuid => 'me'}
- my_wanted_projects(page_size).each do |ob|
+ my_wanted_projects(user, page_size).each do |ob|
parent_of[ob.uuid] = ob.owner_uuid
end
children_of = {false => [], 'me' => [user]}
- my_wanted_projects(page_size).each do |ob|
+ my_wanted_projects(user, page_size).each do |ob|
if ob.owner_uuid != user.uuid and
not parent_of.has_key? ob.owner_uuid
parent_of[ob.uuid] = false
diff --git a/apps/workbench/app/views/application/_projects_tree_menu.html.erb b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
index 10a951a..03cc9fe 100644
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -17,6 +17,6 @@
<% end %>
<% if my_tree[1] and my_tree[1] > my_tree[0].size %>
<li role="presentation" class="dropdown-header">
- Showing <%= my_tree[0].size %> of your projects out of <%= my_tree[1] %> total projects.
+ Showing your top projects, some projects have been omitted.
</li>
<% end %>
diff --git a/apps/workbench/test/controllers/projects_controller_test.rb b/apps/workbench/test/controllers/projects_controller_test.rb
index 32826db..db39666 100644
--- a/apps/workbench/test/controllers/projects_controller_test.rb
+++ b/apps/workbench/test/controllers/projects_controller_test.rb
@@ -423,7 +423,7 @@ class ProjectsControllerTest < ActionController::TestCase
["active", 5, ["aproject", "asubproject"], "anonymously_accessible_project"],
["admin", 5, ["anonymously_accessible_project", "subproject_in_anonymous_accessible_project"], "aproject"],
].each do |user, page_size, tree_segment, unexpected|
- test "build my projects tree for #{user} with page size #{page_size}" do
+ test "build my projects tree for #{user} user with page size #{page_size}" do
use_token user
ctrl = ProjectsController.new
commit 2872b6deb0d9e3d5fbfe0a172aa87949980dfe6f
Merge: 310f6c8 292d026
Author: radhika <radhika at curoverse.com>
Date: Fri Feb 12 16:24:41 2016 -0500
Merge branch 'master' into 8183-projects-dropdown
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list