radhika [Tue, 23 Sep 2014 15:10:44 +0000 (11:10 -0400)]
3038: Recommended default port number related update. Now the defaults are as follows:
API server (dev mode): 3030
API server (test mode): 3000
Workbench (dev mode): 3031
Workbench (test mode): 3001
Peter Amstutz [Mon, 22 Sep 2014 14:05:02 +0000 (10:05 -0400)]
Merge branch '3605-improved-dashboard' refs #3605
Peter Amstutz [Mon, 22 Sep 2014 14:01:30 +0000 (10:01 -0400)]
3605: Fix tab param['tab_pane'] merge conflicts causing tests to fail.
Peter Amstutz [Sat, 20 Sep 2014 20:42:58 +0000 (16:42 -0400)]
3605: Fix tab_pane rendering. Remove spurious console.log.
Peter Amstutz [Fri, 19 Sep 2014 20:42:03 +0000 (16:42 -0400)]
Merge remote-tracking branch 'origin/master' into 3605-improved-dashboard
radhika [Fri, 19 Sep 2014 20:18:15 +0000 (16:18 -0400)]
refs #3898
Merge branch '3898-job-state-attr'
radhika [Fri, 19 Sep 2014 20:18:03 +0000 (16:18 -0400)]
Merge branch 'master' into 3898-job-state-attr
radhika [Fri, 19 Sep 2014 20:17:28 +0000 (16:17 -0400)]
3898: added include statement
Tim Pierce [Fri, 19 Sep 2014 20:14:41 +0000 (16:14 -0400)]
Merge branch '3705-async-work-queue'
Refs #3705.
Tim Pierce [Fri, 19 Sep 2014 20:13:28 +0000 (16:13 -0400)]
3705: rename BlockWorkList -> WorkQueue
Per discussion at
https://github.com/curoverse/arvados/pull/8#discussion_r17637500
refs #3705.
Peter Amstutz [Fri, 19 Sep 2014 19:40:53 +0000 (15:40 -0400)]
Merge branch '3187-pipeline-instance-page' into 3605-improved-dashboard
Conflicts:
apps/workbench/app/models/job.rb
Peter Amstutz [Fri, 19 Sep 2014 19:36:34 +0000 (15:36 -0400)]
Fix Canceled -> Cancelled (american vs canadian spelling, canada wins)
radhika [Fri, 19 Sep 2014 19:25:41 +0000 (15:25 -0400)]
closes #3898
Merge branch '3898-job-state-attr'
Peter Amstutz [Fri, 19 Sep 2014 19:26:30 +0000 (15:26 -0400)]
Merge branch 'master' into 3187-pipeline-instance-page
Conflicts:
apps/workbench/app/models/job.rb
apps/workbench/app/views/application/_content.html.erb
services/api/app/models/job.rb
radhika [Fri, 19 Sep 2014 19:22:45 +0000 (15:22 -0400)]
Merge branch 'master' into 3898-job-state-attr
Tom Clegg [Fri, 19 Sep 2014 18:01:17 +0000 (14:01 -0400)]
Fix Gemfile.lock to use a real gem, not a dev build. refs #3550
Tom Clegg [Fri, 19 Sep 2014 17:49:59 +0000 (13:49 -0400)]
Use new --run-pipeline-here instead of --run-here flag, which no longer does what crunch-dispatch wants. refs #3550
radhika [Fri, 19 Sep 2014 16:27:21 +0000 (12:27 -0400)]
Merge branch 'master' into 3898-job-state-attr
Conflicts:
services/api/db/structure.sql
radhika [Fri, 19 Sep 2014 16:22:46 +0000 (12:22 -0400)]
3898: cancelled_at takes precedence over success flag.
Tim Pierce [Fri, 19 Sep 2014 14:45:50 +0000 (10:45 -0400)]
Bug fix: migration requires CurrentApiClient
Migration 20140918141529_change_user_owner_uuid_not_null requires
system_user_uuid, which is defined in CurrentApiClient.
No issue # (bug fix)
radhika [Fri, 19 Sep 2014 14:19:08 +0000 (10:19 -0400)]
3898: look for success before running.
radhika [Fri, 19 Sep 2014 13:43:14 +0000 (09:43 -0400)]
3898: couple more test assertions
radhika [Fri, 19 Sep 2014 13:33:57 +0000 (09:33 -0400)]
3898: if state is changed to Running and is_locked_by_uuid is nil, return validation error.
radhika [Fri, 19 Sep 2014 13:13:00 +0000 (09:13 -0400)]
3898: set finished_at if nil when success is changed.
radhika [Fri, 19 Sep 2014 12:50:05 +0000 (08:50 -0400)]
Merge branch 'master' into 3898-job-state-attr
radhika [Fri, 19 Sep 2014 12:49:12 +0000 (08:49 -0400)]
3898: add unit test for job state attribute
Peter Amstutz [Fri, 19 Sep 2014 12:38:25 +0000 (08:38 -0400)]
3605: Workbench tests pass!
Brett Smith [Thu, 18 Sep 2014 21:24:35 +0000 (17:24 -0400)]
3147: FUSE requires a built Python SDK.
Unlike our Ruby Gems, Python package versioning is sensitive to
commits that actually affect the package, rather than the entire
arvados repository. On the plus side, this makes it a little easier
to reliably name a package version that meets our requirements. This
commit does that. Refs #3147.
Phil Hodgson [Thu, 18 Sep 2014 21:17:31 +0000 (17:17 -0400)]
Merge branch '3661-copy-move-from-show' refs #3661
Phil Hodgson [Thu, 18 Sep 2014 21:07:03 +0000 (17:07 -0400)]
Merge branch 'master' into 3661-copy-move-from-show
Tom Clegg [Thu, 18 Sep 2014 20:45:15 +0000 (16:45 -0400)]
Merge branch '3901-cannot-find-commit' refs #3901
Brett Smith [Thu, 18 Sep 2014 20:37:18 +0000 (16:37 -0400)]
3147: Rebuild the Python SDK to satisfy FUSE version requirement.
When I wrote the FUSE driver's version dependency, I did my math
wrong, and it's newer than any version of the SDK. This commit will
cause a new SDK to be built with a new version number that satisfies
the dependency. Refs #3147.
Tom Clegg [Thu, 18 Sep 2014 20:34:03 +0000 (16:34 -0400)]
3901: Add missing error checks while copying git objects.
Phil Hodgson [Thu, 18 Sep 2014 20:32:53 +0000 (16:32 -0400)]
3661: visual bug fix: button should be a link
Brett Smith [Thu, 18 Sep 2014 19:56:28 +0000 (15:56 -0400)]
Merge branch '3147-py-collection-retries-wip2'
Closes #3147.
Brett Smith [Mon, 15 Sep 2014 22:13:40 +0000 (18:13 -0400)]
3147: crunch-job retries data uploads more for longer-running jobs.
Brett Smith [Tue, 16 Sep 2014 21:29:38 +0000 (17:29 -0400)]
3147: Add retry support to FUSE driver.
Brett Smith [Mon, 15 Sep 2014 14:58:11 +0000 (10:58 -0400)]
3147: FUSE driver requires a Python SDK with retry support.
I also took out some of the older log-handling code while I was at it,
since the stricter versioning makes it unnecessary.
Brett Smith [Mon, 15 Sep 2014 15:21:31 +0000 (11:21 -0400)]
3147: Add retry support to PySDK list_all utility.
Brett Smith [Mon, 15 Sep 2014 14:37:32 +0000 (10:37 -0400)]
3147: Add retry support to Python CLI tools.
Brett Smith [Tue, 16 Sep 2014 21:27:51 +0000 (17:27 -0400)]
3147: Add retry support to PySDK Collection objects.
This required updating the FUSE driver's SafeApi object to better
imitate a real API object, now that CollectionReader will pass it down
to the underlying KeepClient.
Brett Smith [Fri, 12 Sep 2014 13:28:47 +0000 (09:28 -0400)]
3147: Add retry support to PySDK StreamReader classes.
Brett Smith [Tue, 16 Sep 2014 21:24:31 +0000 (17:24 -0400)]
3147: Make PySDK KeepClient.get and put retry_methods.
Brett Smith [Fri, 12 Sep 2014 12:49:21 +0000 (08:49 -0400)]
3147: Add retry_method to the Python SDK.
This gives us a way to make retry support flexible and consistent
across SDK classes. Any class that has retryable operations should
take a num_retries argument at initialization. Then, the specific
methods that implement those operations should also take a num_retries
argument, which will fall back to the instance's setting by default.
This lets SDK users express their retry preferences wherever it's most
convenient for them.
Brett Smith [Thu, 11 Sep 2014 18:46:37 +0000 (14:46 -0400)]
3147: Fix variable name typo.
This variable was renamed in previous branch work, but this last user
of it wasn't caught until just now.
Brett Smith [Thu, 11 Sep 2014 18:22:12 +0000 (14:22 -0400)]
3147: PySDK StreamReader instantiates a KeepClient late.
Similarly with API client instantiation in KeepClient, this helps with
testing. Refs #3693.
Brett Smith [Fri, 12 Sep 2014 20:46:54 +0000 (16:46 -0400)]
3147: Move PySDK HTTP test infrastructure to testutil.
Making this available to other test collections.
Brett Smith [Wed, 10 Sep 2014 20:44:25 +0000 (16:44 -0400)]
3147: PySDK tests use mock>=1.0 and easier mock side_effect.
radhika [Thu, 18 Sep 2014 19:16:49 +0000 (15:16 -0400)]
3898: db migration to add state attribute to job.
Phil Hodgson [Thu, 18 Sep 2014 19:13:41 +0000 (15:13 -0400)]
Merge branch 'master' into 3661-copy-move-from-show
Conflicts:
apps/workbench/app/assets/javascripts/selection.js.erb
apps/workbench/test/integration/collections_test.rb
Phil Hodgson [Thu, 18 Sep 2014 19:00:46 +0000 (15:00 -0400)]
Merge branch '3338-tab-counts' refs #3338
Phil Hodgson [Thu, 18 Sep 2014 18:32:04 +0000 (14:32 -0400)]
Merge branch 'master' into 3338-tab-counts
Peter Amstutz [Thu, 18 Sep 2014 17:51:13 +0000 (13:51 -0400)]
Merge branch 'master' into 3605-improved-dashboard
Conflicts:
services/api/app/controllers/arvados/v1/jobs_controller.rb
Peter Amstutz [Thu, 18 Sep 2014 17:47:52 +0000 (13:47 -0400)]
Merge branch '3605-queue-position-size' refs #3605
Peter Amstutz [Thu, 18 Sep 2014 17:38:05 +0000 (13:38 -0400)]
3605: Use #each_with_index instead of #each_index
Peter Amstutz [Thu, 18 Sep 2014 17:33:03 +0000 (13:33 -0400)]
Merge branch '3605-node-info-field' refs #3605
Conflicts:
services/api/db/structure.sql
Peter Amstutz [Thu, 18 Sep 2014 17:29:23 +0000 (13:29 -0400)]
3605: Do .to_i on total_cpu_cores, total_ram_mb, and total_scratch_mb in Node#ping.
Peter Amstutz [Thu, 18 Sep 2014 16:11:43 +0000 (12:11 -0400)]
3605: Add properties column to node. Put public-facing node information (cpu
cores, RAM, scratch space) into properties field. Info field is back to being
admin-only.
Tim Pierce [Thu, 18 Sep 2014 14:54:32 +0000 (10:54 -0400)]
Bug fix: Added missing owner_uuid to user fixture.
No issue #.
Tim Pierce [Thu, 18 Sep 2014 14:46:32 +0000 (10:46 -0400)]
Merge branch '3927-user-owner-uuid-not-null'
Closes #3927.
Tim Pierce [Thu, 18 Sep 2014 14:35:05 +0000 (10:35 -0400)]
3927: add NOT NULL constraint to User.owner_uuid
Added a migration setting all users with null owner_uuid to
system_user_uuid, and enforced a NOT NULL constraint on that column.
Peter Amstutz [Thu, 18 Sep 2014 13:30:27 +0000 (09:30 -0400)]
Merge remote-tracking branch 'origin/master' into 3605-improved-dashboard
Phil Hodgson [Thu, 18 Sep 2014 00:42:23 +0000 (20:42 -0400)]
3338: move code that sets the share_links to its own before_filter
Tom Clegg [Thu, 18 Sep 2014 00:11:40 +0000 (20:11 -0400)]
Update Gemfiles to use latest arvados gem. refs #3550
Tom Clegg [Wed, 17 Sep 2014 22:01:03 +0000 (18:01 -0400)]
Merge branch '3550-local-pipeline' closes #3550
Tom Clegg [Wed, 17 Sep 2014 22:00:25 +0000 (18:00 -0400)]
3550: Merge branch 'master' into 3550-local-pipeline
Conflicts:
sdk/cli/bin/arv-run-pipeline-instance
Peter Amstutz [Wed, 17 Sep 2014 19:00:02 +0000 (15:00 -0400)]
3605: Test queue_size method and queue_position field. Adjust "GET queue"
tests for jobs controller to test that users don't see queue items for which
they do not have permissions.
radhika [Wed, 17 Sep 2014 18:56:02 +0000 (14:56 -0400)]
closes #2761
Merge branch '2761-diagnostic-suite'
radhika [Wed, 17 Sep 2014 18:55:17 +0000 (14:55 -0400)]
Merge branch 'master' into 2761-diagnostic-suite
mishaz [Wed, 17 Sep 2014 18:24:51 +0000 (18:24 +0000)]
Merge branch 'update-go-sdk-documentation'
Updating Go SDK Documentation,
no issue #
radhika [Wed, 17 Sep 2014 18:10:40 +0000 (14:10 -0400)]
no issue # - fix couple more places where description is failing on nil template name.
Tim Pierce [Wed, 17 Sep 2014 17:55:23 +0000 (13:55 -0400)]
3411: fix failing tests
The FuseSharedTest requires "pipeline_with_template.pipelineInstance" on
my machine, but not on Jenkins. Puzzling.
No issue # -- bug fix
Phil Hodgson [Wed, 17 Sep 2014 16:24:26 +0000 (12:24 -0400)]
3338: add a 'count-change' event that the tab panes listen for, and trigger it from destroy actions
Tim Pierce [Wed, 17 Sep 2014 15:46:38 +0000 (11:46 -0400)]
Merge branch '3411-expire-collections'
Refs #3411.
Tim Pierce [Wed, 17 Sep 2014 15:45:38 +0000 (11:45 -0400)]
3411: added new collection fixtures owned by active_user
Peter Amstutz [Wed, 17 Sep 2014 15:42:29 +0000 (11:42 -0400)]
Merge branch '3187-pipeline-instance-page' into 3605-improved-dashboard
radhika [Wed, 17 Sep 2014 15:38:37 +0000 (11:38 -0400)]
no issue # : fix nil issue in pipeline_templates page
Peter Amstutz [Wed, 17 Sep 2014 15:36:53 +0000 (11:36 -0400)]
3187: Fix tests and some debug spew.
Tom Clegg [Wed, 17 Sep 2014 15:13:14 +0000 (11:13 -0400)]
3550: Fix race conditions: avoid setting running/success/finished_at
attributes until output and log have been saved.
Tim Pierce [Wed, 17 Sep 2014 14:59:23 +0000 (10:59 -0400)]
Merge branch '3411-expire-collections'
Closes #3411.
Tom Clegg [Wed, 17 Sep 2014 14:57:41 +0000 (10:57 -0400)]
3550: Fix running local job repeatedly on subsequent loop iterations.
Phil Hodgson [Wed, 17 Sep 2014 14:51:06 +0000 (10:51 -0400)]
3661: proposed change of the selection javascript to use the new copies_to_projects? class method on Group
Tom Clegg [Wed, 17 Sep 2014 14:48:13 +0000 (10:48 -0400)]
3550: Add missing .andand
Tim Pierce [Wed, 17 Sep 2014 14:20:48 +0000 (10:20 -0400)]
3411: code review feedback
* Ensure each functional test issues only one request to the controller
* $application_config['default_trash_lifetime'] -> Rails.configuration.default_trash_lifetime
radhika [Wed, 17 Sep 2014 14:10:16 +0000 (10:10 -0400)]
2761: added some comments
radhika [Wed, 17 Sep 2014 14:04:49 +0000 (10:04 -0400)]
Merge branch 'master' into 2761-diagnostic-suite
Tom Clegg [Wed, 17 Sep 2014 13:49:43 +0000 (09:49 -0400)]
3550: Add missing .andand
Peter Amstutz [Wed, 17 Sep 2014 13:29:32 +0000 (09:29 -0400)]
3605: Add "queue_position" to jobs. Also add a route on jobs controller to get
the true size of the job queue.
Peter Amstutz [Wed, 17 Sep 2014 13:13:52 +0000 (09:13 -0400)]
Merge branch 'master' into 3605-improved-dashboard
Conflicts:
apps/workbench/app/models/job.rb
services/api/app/models/job.rb
Peter Amstutz [Wed, 17 Sep 2014 13:11:36 +0000 (09:11 -0400)]
Merge branch '3605-node-info-field' refs #3605
Peter Amstutz [Wed, 17 Sep 2014 01:00:14 +0000 (21:00 -0400)]
Fix test
Tim Pierce [Wed, 17 Sep 2014 02:40:16 +0000 (22:40 -0400)]
Merge branch '3705-keep-blockworklist'
Closes #3705.
radhika [Wed, 17 Sep 2014 02:36:08 +0000 (22:36 -0400)]
Merge branch 'master' into 2761-diagnostic-suite
radhika [Wed, 17 Sep 2014 02:35:12 +0000 (22:35 -0400)]
2761: minor updates to diagnostics test config explanation.
Tim Pierce [Wed, 17 Sep 2014 02:34:20 +0000 (22:34 -0400)]
3705: use %v to format interface types
Peter Amstutz [Wed, 17 Sep 2014 02:30:21 +0000 (22:30 -0400)]
Fix arv-run-pipeline-instance to not crash when template is null. no issue #
Tim Pierce [Wed, 17 Sep 2014 02:09:34 +0000 (22:09 -0400)]
3705: drop unnecessary 'items' from BlockWorkList
Tim Pierce [Wed, 17 Sep 2014 01:56:55 +0000 (21:56 -0400)]
3705: use helper functions in tests
Peter Amstutz [Wed, 17 Sep 2014 01:00:14 +0000 (21:00 -0400)]
Fix test
Phil Hodgson [Tue, 16 Sep 2014 23:09:32 +0000 (19:09 -0400)]
3338: move the user_is_manager and shared items to the already-overridden #find_object_by_uuid method so that these are available to all the same actions
projects / arvados.git / log