Tim Pierce [Mon, 6 Oct 2014 18:22:00 +0000 (14:22 -0400)]
Merge branch '3825-crunch-pipe-to-arv-put-final'
Closes #3825.
Tim Pierce [Mon, 6 Oct 2014 17:24:47 +0000 (13:24 -0400)]
3825: code review
* avoid overloading "output" (usually used for the output from a task or job than for diagnostic output from crunch)
** renamed:
*** start_output_log -> log_writer_start
*** write_output_log -> log_writer_send
*** finish_output_log -> log_writer_finish
*** output_log_is_active -> log_writer_is_active
* fixed missing semicolon
radhika [Mon, 6 Oct 2014 17:50:11 +0000 (13:50 -0400)]
closes #3583
Merge branch '3583-provenance-graph-issue'
radhika [Mon, 6 Oct 2014 17:49:33 +0000 (13:49 -0400)]
Merge branch 'master' into 3583-provenance-graph-issue
Peter Amstutz [Mon, 6 Oct 2014 17:13:15 +0000 (13:13 -0400)]
Merge branch '3859-crunch-job-use-lock' closes #3859
Tom Clegg [Mon, 6 Oct 2014 15:51:49 +0000 (11:51 -0400)]
Merge branch '3687-grant-permission-on-repo-TC' closes #3687
Tom Clegg [Mon, 6 Oct 2014 15:15:05 +0000 (11:15 -0400)]
3687: Merge branch 'master' into 3687-grant-permission-on-repo-TC
radhika [Mon, 6 Oct 2014 14:39:41 +0000 (10:39 -0400)]
closes #4025
Merge branch '4025-move-project-button-label'
radhika [Mon, 6 Oct 2014 14:23:49 +0000 (10:23 -0400)]
4025: Change the button label 'Move...' to 'Move <object_class>...' and update test assertion accordingly.
radhika [Mon, 6 Oct 2014 14:18:12 +0000 (10:18 -0400)]
Merge branch 'master' into 4025-move-project-button-label
Conflicts:
apps/workbench/app/views/application/_title_and_buttons.html.erb
Tom Clegg [Fri, 3 Oct 2014 23:59:00 +0000 (19:59 -0400)]
3687: Add comment about redundant lookup.
Tom Clegg [Fri, 3 Oct 2014 23:44:56 +0000 (19:44 -0400)]
3687: OK here just means this loop is OK, not everything is OK!
Tom Clegg [Fri, 3 Oct 2014 21:41:54 +0000 (17:41 -0400)]
3687: in User#can?, consider permission links with head_uuid pointing directly at the target.
radhika [Fri, 3 Oct 2014 21:22:09 +0000 (17:22 -0400)]
closes #4036
Merge branch '4036-combine-collections-in-project-issue'
Tim Pierce [Fri, 3 Oct 2014 18:48:34 +0000 (14:48 -0400)]
3687: add functional test for sharing within a group
Test that two unprivileged users in the same group can share collections.
radhika [Fri, 3 Oct 2014 14:13:10 +0000 (10:13 -0400)]
4036: add comment for flash alert div
radhika [Fri, 3 Oct 2014 14:05:59 +0000 (10:05 -0400)]
Merge branch 'master' into 4036-combine-collections-in-project-issue
radhika [Fri, 3 Oct 2014 11:34:33 +0000 (07:34 -0400)]
4025: add fa-fw to the newly added i tag class like all other such usages.
radhika [Fri, 3 Oct 2014 11:15:23 +0000 (07:15 -0400)]
4205: add tooltips to pipeline instance tab line buttons
radhika [Fri, 3 Oct 2014 00:08:54 +0000 (20:08 -0400)]
Merge branch 'master' into 4025-move-project-button-label
radhika [Fri, 3 Oct 2014 00:07:11 +0000 (20:07 -0400)]
4025: add tooltips to some of the tab line buttons and also adjust the title of the "Move" button.
Tim Pierce [Thu, 2 Oct 2014 18:40:25 +0000 (14:40 -0400)]
3825: write log output directly to a pipe.
Added functions:
* start_output_log($logfilename)
* write_output_log($txt)
* finish_output_log()
* output_log_is_active()
Rewrote all code that referenced $local_logfile in terms of these
functions.
Peter Amstutz [Thu, 2 Oct 2014 20:33:16 +0000 (16:33 -0400)]
Merge branch '3769-throttle-logs' closes #3769
Peter Amstutz [Thu, 2 Oct 2014 20:32:02 +0000 (16:32 -0400)]
3769: Spelling fix and remove debugging puts.
radhika [Thu, 2 Oct 2014 19:13:26 +0000 (15:13 -0400)]
4036: correct div class
radhika [Thu, 2 Oct 2014 18:54:59 +0000 (14:54 -0400)]
3583: extend encode quotes logic for script parameters as well, just in case.
radhika [Thu, 2 Oct 2014 16:19:54 +0000 (12:19 -0400)]
Merge branch 'master' into 3583-provenance-graph-issue
radhika [Thu, 2 Oct 2014 15:43:09 +0000 (11:43 -0400)]
4036: update the test that combines files from within a collection to expect the new collection in current project, if applicable and writable.
radhika [Thu, 2 Oct 2014 15:01:35 +0000 (11:01 -0400)]
Merge branch 'master' into 4036-combine-collections-in-project-issue
radhika [Thu, 2 Oct 2014 14:59:50 +0000 (10:59 -0400)]
4036: when files in a collection are combined, create the new collection in the original collection's project, provided it is writable.
Peter Amstutz [Thu, 2 Oct 2014 14:52:47 +0000 (10:52 -0400)]
Merge branch 'master' into 3769-throttle-logs
Conflicts:
services/api/script/crunch-dispatch.rb
Peter Amstutz [Thu, 2 Oct 2014 14:51:36 +0000 (10:51 -0400)]
Merge branch '3052-crunch-log-stdout' closes #3052
Peter Amstutz [Thu, 2 Oct 2014 14:46:37 +0000 (10:46 -0400)]
Merge branch 'master' into 3052-crunch-log-stdout
Peter Amstutz [Thu, 2 Oct 2014 14:46:23 +0000 (10:46 -0400)]
3052: Change ruby style ruby style {:stderr => ''} to json style {stderr: ''}
Tim Pierce [Thu, 2 Oct 2014 14:44:30 +0000 (10:44 -0400)]
Merge branch '3782-large-job-logs'
Closes #3782.
Tim Pierce [Thu, 2 Oct 2014 14:44:13 +0000 (10:44 -0400)]
3782: fix FuseSharedTest
radhika [Thu, 2 Oct 2014 14:29:04 +0000 (10:29 -0400)]
4036: update combine collection tests to expect the newly created collection in the right project.
Peter Amstutz [Thu, 2 Oct 2014 13:22:28 +0000 (09:22 -0400)]
Add test fixture to fix "test_cancel_someone_else's_visible_job" refs #3859
radhika [Thu, 2 Oct 2014 12:32:05 +0000 (08:32 -0400)]
4036: improve rails flash message display to check if the message is an error.
radhika [Thu, 2 Oct 2014 10:49:45 +0000 (06:49 -0400)]
Merge branch 'master' into 3583-provenance-graph-issue
radhika [Thu, 2 Oct 2014 10:49:15 +0000 (06:49 -0400)]
3583: replace " characters with \" in node value to ensure graph does not get mixed up on node labels.
radhika [Thu, 2 Oct 2014 10:37:25 +0000 (06:37 -0400)]
Merge branch 'master' of git.curoverse.com:arvados into 4036-combine-collections-in-project-issue
radhika [Thu, 2 Oct 2014 10:35:50 +0000 (06:35 -0400)]
4046: when combining collections in a project, set current project as owner (if writable) and show the new collection.
Peter Amstutz [Thu, 2 Oct 2014 02:01:19 +0000 (22:01 -0400)]
Merge branch '3859-api-job-lock-method' refs #3859
Peter Amstutz [Thu, 2 Oct 2014 01:59:59 +0000 (21:59 -0400)]
3769: Tweak throttle/truncate messages and application.default.yml defaults.
Peter Amstutz [Wed, 1 Oct 2014 21:12:52 +0000 (17:12 -0400)]
3769: Add rate_limit with log throttling logic. Multiple configuration
parameters to throttle excessive logging by bytes, lines, logs table events,
and total logged output.
Tim Pierce [Wed, 1 Oct 2014 20:52:17 +0000 (16:52 -0400)]
3782: code review feedback
* Fixed whitespace, JavaScript style in _show_log.html.erb
* Removed unused bytecount variable from file_enumerator
* Changed the new job and collection fixtures to have the job uuid match
the uuid listed in the log.
Tim Pierce [Wed, 1 Oct 2014 20:04:05 +0000 (16:04 -0400)]
3782: added state to job fixture
Tim Pierce [Wed, 1 Oct 2014 19:43:15 +0000 (15:43 -0400)]
Merge branch 'master' into 3782-large-job-logs
Conflicts:
services/api/test/fixtures/collections.yml
services/api/test/fixtures/jobs.yml
Tom Clegg [Wed, 1 Oct 2014 19:36:46 +0000 (15:36 -0400)]
Merge branch '3782-stub-file-content' refs #3782
Tom Clegg [Wed, 1 Oct 2014 19:35:33 +0000 (15:35 -0400)]
3782: Merge branch 'master' into 3782-stub-file-content
Peter Amstutz [Wed, 1 Oct 2014 19:23:23 +0000 (15:23 -0400)]
Merge branch '3052-crunch-log-stdout' into 3769-throttle-logs
Tom Clegg [Wed, 1 Oct 2014 19:12:07 +0000 (15:12 -0400)]
3782: Use stubbed file content for "inactive user can retrieve user agreement" test.
Tim Pierce [Wed, 1 Oct 2014 18:59:30 +0000 (14:59 -0400)]
Merge branch '4000-rerun-pipeline-changed-template'
Closes #4000.
Tim Pierce [Wed, 1 Oct 2014 18:58:58 +0000 (14:58 -0400)]
4000: update both functional tests.
Peter Amstutz [Wed, 1 Oct 2014 18:33:23 +0000 (14:33 -0400)]
Merge branch 'master' into 3769-throttle-logs
Tim Pierce [Wed, 1 Oct 2014 18:28:38 +0000 (14:28 -0400)]
4000: tighten up functional test
Updated the test to ensure that a copied pipeline instance actually has
the expected script_parameters from both the source instance and source
template, respectively.
Peter Amstutz [Wed, 1 Oct 2014 18:23:21 +0000 (14:23 -0400)]
Use job state field instead of running/success columns. refs #3898
Tim Pierce [Wed, 1 Oct 2014 17:50:53 +0000 (13:50 -0400)]
3782: bugfix and added integration test
* Fixed bug where log viewer would always request partial log and receive
206, even when total log size is shorter than log_viewer_max_bytes.
* Added integration tests:
** set up KEEP_LOCAL_STORE with dummy log
** test retrieving full job log
** test retrieving partial job log
radhika [Wed, 1 Oct 2014 17:33:37 +0000 (13:33 -0400)]
Merge branch 'master' into 3583-provenance-graph-issue
radhika [Wed, 1 Oct 2014 17:31:15 +0000 (13:31 -0400)]
3583: replace " characters with ' characters in node value to ensure graph does not get mixed up on node labels.
Peter Amstutz [Wed, 1 Oct 2014 17:06:17 +0000 (13:06 -0400)]
3859: unit test for job state changes
Tom Clegg [Wed, 1 Oct 2014 16:08:01 +0000 (12:08 -0400)]
3782: Merge branch 'master' into 3782-stub-file-content
Tom Clegg [Wed, 1 Oct 2014 16:07:58 +0000 (12:07 -0400)]
3782: Remove obsolete helper method.
Peter Amstutz [Wed, 1 Oct 2014 16:00:25 +0000 (12:00 -0400)]
3769: Allow up to crunch_limit_log_event_throttle_rate per
crunch_limit_log_event_throttle_period, then silence the logs until the next
crunch_limit_log_event_throttle_period.
Peter Amstutz [Wed, 1 Oct 2014 15:23:37 +0000 (11:23 -0400)]
3859: Added AlreadyLockedError for job lock conflict. Added runningbarbaz
fixture so test "cancel someone else's visible job" is testing the right thing.
Peter Amstutz [Wed, 1 Oct 2014 13:47:01 +0000 (09:47 -0400)]
Merge branch '4004-restore-dashboard-buttons' closes #4004
Peter Amstutz [Wed, 1 Oct 2014 13:46:14 +0000 (09:46 -0400)]
4004: Add newlines for readability
Peter Amstutz [Wed, 1 Oct 2014 01:51:41 +0000 (21:51 -0400)]
3899: Fix for counting complete/failed components refs #3899
Peter Amstutz [Wed, 1 Oct 2014 01:30:56 +0000 (21:30 -0400)]
3859: Add functional test for locking and fix tests broken by validate_state_change.
Peter Amstutz [Wed, 1 Oct 2014 00:11:27 +0000 (20:11 -0400)]
Merge branch 'master' into 3859-api-job-lock-method
Peter Amstutz [Wed, 1 Oct 2014 00:11:13 +0000 (20:11 -0400)]
Merge branch 'master' into 3859-crunch-job-use-lock
Tim Pierce [Tue, 30 Sep 2014 22:07:15 +0000 (18:07 -0400)]
4000: fix copying pipeline instances with newer templates
* When copying script parameters from a pipeline instance, check that
the component exists in the source instance before blindly
dereferencing it.
* Added tests for copying when components=use_latest and when
script=use_same (the two edge cases exposed by this bug)
Peter Amstutz [Tue, 30 Sep 2014 21:10:07 +0000 (17:10 -0400)]
3959: crunch-job use job locking API
Peter Amstutz [Tue, 30 Sep 2014 20:56:52 +0000 (16:56 -0400)]
3859: Cleaned up validate_state_change. Added unit test for job locking.
Peter Amstutz [Tue, 30 Sep 2014 19:40:37 +0000 (15:40 -0400)]
4004: Rename "Compute status" to "Compute and job status". Added integration
tests for buttons. Reduced dashboard page rendering time by at least 25% by
batching certain API server requests (previously happing per-object),
Tim Pierce [Mon, 29 Sep 2014 22:25:36 +0000 (18:25 -0400)]
3782: check for Content-Range header in response
Change the logic for detecting whether the log has been truncated to:
* response status code is 206
* a Content-Range header is present with 'bytes 0-x/y'
* x + 1 < y
Add a "download full log" link that is present when the full log is
available to be viewed.
Tim Pierce [Tue, 30 Sep 2014 17:52:38 +0000 (13:52 -0400)]
Merge branch '3961-uuid-assignment-not-permitted'
Closes #3961.
Tim Pierce [Tue, 30 Sep 2014 17:51:54 +0000 (13:51 -0400)]
3961: fix FuseSharedTest
Added new active_user collection to the FuseSharedTest.
Peter Amstutz [Tue, 30 Sep 2014 17:08:19 +0000 (13:08 -0400)]
3052: Style tweak, iterate over j[:buf] to read streams
Tim Pierce [Tue, 30 Sep 2014 17:01:07 +0000 (13:01 -0400)]
Merge branch '3961-uuid-assignment-not-permitted'
Closes #3961.
Tim Pierce [Tue, 30 Sep 2014 16:59:40 +0000 (12:59 -0400)]
3961: more explicit assertions and error text
Tom Clegg [Tue, 30 Sep 2014 14:57:13 +0000 (10:57 -0400)]
3782: Isolate file_enumerator stubbing to the current test. Introduce mocha.
Peter Amstutz [Tue, 30 Sep 2014 13:44:45 +0000 (09:44 -0400)]
3052: Rename variable "std" to "stream"
Tim Pierce [Tue, 30 Sep 2014 04:42:16 +0000 (00:42 -0400)]
3961: test creating subprojects under home with duplicate names
New tests:
* unprivileged user creating a subproject under their home project, with
an existing name, returns 422
* unprivileged user creating a subproject under their home project, with
an existing name, and ensure_unique_name=true, succeeds
Tim Pierce [Mon, 29 Sep 2014 21:55:17 +0000 (17:55 -0400)]
3782: keep log viewer code in _show_log.html.erb
Keep log-related restrictions in the log viewer and not in general
purpose workbench code:
* Add Rails.configuration.log_viewer_max_bytes to specify the maximum
number of log bytes to display
* The log viewer specifies a byte limit via the HTTP Range header. The
Content-Length of the response is set to the minimum of the 'size'
query parameter and the byte range. If the log appears to have been
truncated, the viewer reports it in the 'log_viewer_overview' pane.
* CollectionsController.FileStreamer either delivers the entire file
or exactly opts[:maxbytes] bytes, whichever comes first. It does not
add any log-specific message.
Peter Amstutz [Mon, 29 Sep 2014 21:11:31 +0000 (17:11 -0400)]
3052: capture stdout to log in crunch-dispatch
Brett Smith [Mon, 29 Sep 2014 20:07:55 +0000 (16:07 -0400)]
3866: PySDK KeepClient accommodates services with IPv6 addresses.
I thought there was going to be a nicer way to construct URLs than
this, but urllib.urlunparse is still expecting the host+port as a
single string, so this approach is easier. Closes #3866.
Tim Pierce [Mon, 29 Sep 2014 18:01:00 +0000 (14:01 -0400)]
3782: print log lines compatible with the log viewer
When the log is truncated, make it parsable by the log viewer regex in
addToLogViewer().
Brett Smith [Mon, 29 Sep 2014 16:28:36 +0000 (12:28 -0400)]
Merge branch '3848-egg-default-git-tag-wip'
Closes #3848, #3952.
Brett Smith [Fri, 26 Sep 2014 21:06:15 +0000 (17:06 -0400)]
3848: Package version numbers use UTC timestamps.
Per note-9 in the issue.
Brett Smith [Mon, 22 Sep 2014 20:45:19 +0000 (16:45 -0400)]
3848: Python packages build with git tag by default.
This moves the build logic that we currently encode in Jenkins into
our setup.py, and makes it easier for developers to have versions in
sync with real users.
radhika [Mon, 29 Sep 2014 15:13:50 +0000 (11:13 -0400)]
closes #3889
Merge branch '3889-functional-testing'
Tim Pierce [Mon, 29 Sep 2014 15:06:49 +0000 (11:06 -0400)]
3961: reset object UUID when ensure_unique_name is set
When saving an object that has to be renamed with ensure_unique_name,
force @object.uuid to nil so that validate_uuid will not be confused
into thinking we are trying to reassign the uuid.
radhika [Mon, 29 Sep 2014 14:50:36 +0000 (10:50 -0400)]
Merge branch 'master' into 3889-functional-testing
Tom Clegg [Mon, 29 Sep 2014 14:32:00 +0000 (10:32 -0400)]
Merge branch '3616-live-stream' closes #3616
radhika [Sat, 27 Sep 2014 01:50:16 +0000 (21:50 -0400)]
Merge branch 'master' into 3889-functional-testing
radhika [Sat, 27 Sep 2014 01:48:51 +0000 (21:48 -0400)]
3889: add a new integration tester for users controller. Refactor code so that users functional and integration tests can reuse some of the helper methods.
Tim Pierce [Fri, 26 Sep 2014 19:38:45 +0000 (15:38 -0400)]
3782: restore default of no maxbytes
Use the 'size' query parameter to specify the limit of log bytes to
display for a job. If no 'size' parameter is present, the FileStreamer
class reads up to 2**16 bytes from the API server.
Peter Amstutz [Fri, 26 Sep 2014 20:44:35 +0000 (16:44 -0400)]
Merge branch '3871-non-ascii-project-names' closes #3871