From 611f3d6956c547f16a87b5c728b64091ec32ebb6 Mon Sep 17 00:00:00 2001 From: radhika Date: Wed, 2 Mar 2016 13:19:24 -0500 Subject: [PATCH] 7399: do not handle crunchstat stderr partial line segments in this story. --- services/api/lib/crunch_dispatch.rb | 4 +--- services/api/test/unit/crunch_dispatch_test.rb | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/services/api/lib/crunch_dispatch.rb b/services/api/lib/crunch_dispatch.rb index 24d4d33f30..6300b14834 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 a4503a845e..8080790526 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 [...]" -- 2.39.5