logstash-input-jdbc 4.3.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6e3311aea8fc892c6630483444ee3c03c5ee1b02d55dca8db4ddb648cfecc89
-  data.tar.gz: 69ad000d130f1336961c816800925fc227ed53c0abecbb89d4c01ea918b9541d
+  metadata.gz: dbcee49388bb159c11488cba2030c74f0d51f6e52615c1190a7f0bc9d2d84dda
+  data.tar.gz: 615585ac894d3a2bbb8677848b9d518d68594d53477dbc6c71413044373ffa51
 SHA512:
-  metadata.gz: 1a1a9572a873e8b51e2700d51d70e76f56c7b77e4546d8a5bc17c21db7d0bf318291dc149c213f6088fb6c49f5d671e0036d22cad19ceb1f18eab92def13767a
-  data.tar.gz: 728fc81b1034c9d21a4d6c9a4e27930c6d64b421a6c36ee896b78f6391c848826cdbb6dbc6235d7a17abc0270f93efca211cd216590db999144996e7ac8e1975
+  metadata.gz: 816c79b9ac881b3fe8b2524323e8b67321d21dfda0c82efa638a8b2a3bccaa7e9aeebe920385cb33b4ba01e19f60cb368fbcdca9fe43aba6dc84df4e891ef46b
+  data.tar.gz: 6c2f68235f963c58bbbaf523b09cdfb7dae004fee7a6973de860761b394579f6aae4efab07259f4ed923d3f78c9d04cb1cde39ead37c6376e882151c2065dad0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.3.2
+  - [#251](https://github.com/logstash-plugins/logstash-input-jdbc/issues/251) Fix connection and memory leak.
+  
 ## 4.3.1
   - Update gemspec summary
 

data/lib/logstash/inputs/jdbc.rb

@@ -259,9 +259,8 @@ class LogStash::Inputs::Jdbc < LogStash::Inputs::Base
   end # def run
 
   def stop
-    @scheduler.stop if @scheduler
-
     close_jdbc_connection
+    @scheduler.stop if @scheduler
   end
 
   private

data/lib/logstash/plugin_mixins/jdbc.rb

@@ -4,6 +4,8 @@ require "logstash/config/mixin"
 require "time"
 require "date"
 
+java_import java.util.concurrent.locks.ReentrantLock
+
 # Tentative of abstracting JDBC logic to a mixin
 # for potential reuse in other plugins (input/output)
 module LogStash::PluginMixins::Jdbc
@@ -191,6 +193,7 @@ module LogStash::PluginMixins::Jdbc
 
   public
   def prepare_jdbc_connection
+    @connection_lock = ReentrantLock.new
     if @use_column_value
       case @tracking_column_type
         when "numeric"
@@ -206,26 +209,41 @@ module LogStash::PluginMixins::Jdbc
   public
   def close_jdbc_connection
     begin
+      # pipeline restarts can also close the jdbc connection, block until the current executing statement is finished to avoid leaking connections
+      # connections in use won't really get closed
+      @connection_lock.lock
       @database.disconnect if @database
     rescue => e
       @logger.warn("Failed to close connection", :exception => e)
+    ensure
+      @connection_lock.unlock
     end
   end
 
   public
   def execute_statement(statement, parameters)
-    success = false
-    open_jdbc_connection
-    begin
-      parameters = symbolized_params(parameters)
-      query = @database[statement, parameters]
-      sql_last_value = @use_column_value ? @sql_last_value : Time.now.utc
-      @tracking_column_warning_sent = false
-      @logger.debug? and @logger.debug("Executing JDBC query", :statement => statement, :parameters => parameters, :count => query.count)
-
-      if @jdbc_paging_enabled
-        query.each_page(@jdbc_page_size) do |paged_dataset|
-          paged_dataset.each do |row|
+      success = false
+      @connection_lock.lock
+      open_jdbc_connection
+      begin
+        parameters = symbolized_params(parameters)
+        query = @database[statement, parameters]
+        sql_last_value = @use_column_value ? @sql_last_value : Time.now.utc
+        @tracking_column_warning_sent = false
+        @logger.debug? and @logger.debug("Executing JDBC query", :statement => statement, :parameters => parameters, :count => query.count)
+
+        if @jdbc_paging_enabled
+          query.each_page(@jdbc_page_size) do |paged_dataset|
+            paged_dataset.each do |row|
+              sql_last_value = get_column_value(row) if @use_column_value
+              if @tracking_column_type=="timestamp" and @use_column_value and sql_last_value.is_a?(DateTime)
+                sql_last_value=Time.parse(sql_last_value.to_s) # Coerce the timestamp to a `Time`
+              end
+              yield extract_values_from(row)
+            end
+          end
+        else
+          query.each do |row|
             sql_last_value = get_column_value(row) if @use_column_value
             if @tracking_column_type=="timestamp" and @use_column_value and sql_last_value.is_a?(DateTime)
               sql_last_value=Time.parse(sql_last_value.to_s) # Coerce the timestamp to a `Time`
@@ -233,23 +251,16 @@ module LogStash::PluginMixins::Jdbc
             yield extract_values_from(row)
           end
         end
+        success = true
+      rescue Sequel::DatabaseConnectionError, Sequel::DatabaseError => e
+        @logger.warn("Exception when executing JDBC query", :exception => e)
       else
-        query.each do |row|
-          sql_last_value = get_column_value(row) if @use_column_value
-          if @tracking_column_type=="timestamp" and @use_column_value and sql_last_value.is_a?(DateTime)
-            sql_last_value=Time.parse(sql_last_value.to_s) # Coerce the timestamp to a `Time`
-          end
-          yield extract_values_from(row)
-        end
+        @sql_last_value = sql_last_value
+      ensure
+        close_jdbc_connection
+        @connection_lock.unlock
       end
-      success = true
-    rescue Sequel::DatabaseConnectionError, Sequel::DatabaseError => e
-      @logger.warn("Exception when executing JDBC query", :exception => e)
-    else
-      @sql_last_value = sql_last_value
-    end
-    close_jdbc_connection
-    return success
+      return success
   end
 
   public

data/logstash-input-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-jdbc'
-  s.version         = '4.3.1'
+  s.version         = '4.3.2'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Creates events from JDBC data"
   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-jdbc
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Creates events from JDBC data