logstash-input-file 4.1.7 → 4.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452117d6e30aa2df0ee9aa1f7c663a4bed00569489a53ba479f8b68789bb9051
-  data.tar.gz: 1724d57ff775ed4df8ef3821cafdb044163a8b6c246269269db4e7ef7d1bbe00
+  metadata.gz: b86fa03636ec6ef833c6fced1c2d42abfc5067f34a70bce8d3362a98c91ff566
+  data.tar.gz: 691ab87c3fd89b33d36ffa151be97cd91147aca22d23c1a20a171adc3d104f05
 SHA512:
-  metadata.gz: 555004eb3d45f7042703e1adc61b027a009baef5578ee6d3e4d22318c0a26244c47da571b68f55041851e82b305dbfcb7fd08d4888e4f85ca95cce63627b3d51
-  data.tar.gz: 7a4988cf0671f09eb1e37ed007adbee6aeb3f097f449e6246f04ac9e40dde80139343b0ae1f5321fd94f540b15b05e2dee676d208b0c71b944e8a9512ae985e2
+  metadata.gz: fe9f47707469145ca8b5343bcaeeeec17aaf193aad821e23db1400454e1f686e27007365e1c44a2d0f58d1d4cb49cb52cb51af90e5077c6c62cce4dac7c1fa3b
+  data.tar.gz: 2b531984da98f653dfa25af2b571b401318980f4b6d93043a0d3c1f7a147a39f4174305cb50ce3634875330bcac871c2b4c08d4bdac1c3256a0c7521a15c4233

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.1.8
+  - Fixed problem in tail and read modes where the read loop could get stuck if an IO error occurs in the loop.
+    The file appears to be being read but it is not, suspected with file truncation schemes.
+    [Issue #205](https://github.com/logstash-plugins/logstash-input-file/issues/205)
+
 ## 4.1.7
   - Fixed problem in rotation handling where the target file being rotated was
   subjected to the start_position setting when it must always start from the beginning.

data/lib/filewatch/bootstrap.rb

@@ -42,7 +42,23 @@ module FileWatch
   end
 
   BufferExtractResult = Struct.new(:lines, :warning, :additional)
-  LoopControlResult = Struct.new(:count, :size, :more)
+
+  class LoopControlResult
+    attr_reader :count, :size, :more
+
+    def initialize(count, size, more)
+      @count, @size, @more = count, size, more
+      @read_error_detected = false
+    end
+
+    def flag_read_error
+      @read_error_detected = true
+    end
+
+    def keep_looping?
+      !@read_error_detected && @more
+    end
+  end
 
   class NoSinceDBPathGiven < StandardError; end
 

data/lib/filewatch/read_mode/handlers/read_file.rb

@@ -10,7 +10,7 @@ module FileWatch module ReadMode module Handlers
           loop_control = watched_file.loop_control_adjusted_for_stat_size
           controlled_read(watched_file, loop_control)
           sincedb_collection.request_disk_flush
-          break unless loop_control.more
+          break unless loop_control.keep_looping?
         end
         if watched_file.all_read?
           # flush the buffer now in case there is no final delimiter
@@ -42,14 +42,17 @@ module FileWatch module ReadMode module Handlers
           end
         rescue EOFError
           logger.error("controlled_read: eof error reading file", "path" => watched_file.path, "error" => e.inspect, "backtrace" => e.backtrace.take(8))
+          loop_control.flag_read_error
           break
         rescue Errno::EWOULDBLOCK, Errno::EINTR
           logger.error("controlled_read: block or interrupt error reading file", "path" => watched_file.path, "error" => e.inspect, "backtrace" => e.backtrace.take(8))
           watched_file.listener.error
+          loop_control.flag_read_error
           break
         rescue => e
           logger.error("controlled_read: general error reading file", "path" => watched_file.path, "error" => e.inspect, "backtrace" => e.backtrace.take(8))
           watched_file.listener.error
+          loop_control.flag_read_error
           break
         end
       end

data/lib/filewatch/tail_mode/handlers/base.rb

@@ -59,13 +59,16 @@ module FileWatch module TailMode module Handlers
           end
         rescue EOFError
           # it only makes sense to signal EOF in "read" mode not "tail"
+          loop_control.flag_read_error
           break
         rescue Errno::EWOULDBLOCK, Errno::EINTR
           watched_file.listener.error
+          loop_control.flag_read_error
           break
         rescue => e
           logger.error("read_to_eof: general error reading #{watched_file.path}", "error" => e.inspect, "backtrace" => e.backtrace.take(4))
           watched_file.listener.error
+          loop_control.flag_read_error
           break
         end
       end

data/lib/filewatch/tail_mode/handlers/grow.rb

@@ -8,7 +8,7 @@ module FileWatch module TailMode module Handlers
         break if quit?
         loop_control = watched_file.loop_control_adjusted_for_stat_size
         controlled_read(watched_file, loop_control)
-        break unless loop_control.more
+        break unless loop_control.keep_looping?
       end
     end
   end

data/lib/filewatch/tail_mode/handlers/shrink.rb

@@ -9,7 +9,7 @@ module FileWatch module TailMode module Handlers
         break if quit?
         loop_control = watched_file.loop_control_adjusted_for_stat_size
         controlled_read(watched_file, loop_control)
-        break unless loop_control.more
+        break unless loop_control.keep_looping?
       end
     end
 

data/logstash-input-file.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-file'
-  s.version         = '4.1.7'
+  s.version         = '4.1.8'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Streams events from files"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-file
 version: !ruby/object:Gem::Version
-  version: 4.1.7
+  version: 4.1.8
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement