[ARVADOS] updated: 611f3d6956c547f16a87b5c728b64091ec32ebb6

[Git user]

Summary of changes:
 services/api/lib/crunch_dispatch.rb            | 4 +---
 services/api/test/unit/crunch_dispatch_test.rb | 6 ------
 2 files changed, 1 insertion(+), 9 deletions(-)

       via  611f3d6956c547f16a87b5c728b64091ec32ebb6 (commit)
      from  eda00143401effca0bbc0b2f6e4fde8ee2ede8a0 (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 611f3d6956c547f16a87b5c728b64091ec32ebb6
Author: radhika <radhika at curoverse.com>
Date:   Wed Mar 2 13:19:24 2016 -0500

    7399: do not handle crunchstat stderr partial line segments in this story.

diff --git a/services/api/lib/crunch_dispatch.rb b/services/api/lib/crunch_dispatch.rb
index 24d4d33..6300b14 100644
--- a/services/api/lib/crunch_dispatch.rb
+++ b/services/api/lib/crunch_dispatch.rb
@@ -448,9 +448,7 @@ class CrunchDispatch
       partial_line = false
       skip_counts = false
       matches = line.match(/^\S+ \S+ \d+ \d+ stderr (.*)/)
-      if matches and matches[1] and
-         (matches[1].start_with?('[...]') or matches[1].start_with?('crunchstat [...]')) and
-         matches[1].end_with?('[...]')
+      if matches and matches[1] and matches[1].start_with?('[...]') and matches[1].end_with?('[...]')
         partial_line = true
         if Time.now > running_job[:log_throttle_partial_line_last_at] + Rails.configuration.crunch_log_partial_line_throttle_period
           running_job[:log_throttle_partial_line_last_at] = Time.now
diff --git a/services/api/test/unit/crunch_dispatch_test.rb b/services/api/test/unit/crunch_dispatch_test.rb
index a4503a8..8080790 100644
--- a/services/api/test/unit/crunch_dispatch_test.rb
+++ b/services/api/test/unit/crunch_dispatch_test.rb
@@ -152,12 +152,6 @@ class CrunchDispatchTest < ActiveSupport::TestCase
       assert_equal false, limit
       assert_equal 2, job[:log_throttle_lines_so_far]
 
-      # crunchstat partial line segment is also skipped
-      line = "#{now} localhost 100 0 stderr crunchstat [...] second partial line segment within the interval [...]"
-      limit = dispatch.rate_limit(job, line)
-      assert_equal false, limit
-      assert_equal 2, job[:log_throttle_lines_so_far]
-
       # next partial line after interval is counted towards skipped lines
       sleep(1)
       line = "#{now} localhost 100 0 stderr [...] third partial line segment after the interval [...]"

-----------------------------------------------------------------------


hooks/post-receive
--