test-opensearch 0.0.0.16 → 0.0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b216382dff7cd23a26b0cfa304a79b86c0d4a0085a3ecc9fbc61348411f8c575
-  data.tar.gz: 68cc2c100b076ad587c3c1d0706f6578b3bbf13101da4a931fc712896a0675d4
+  metadata.gz: 91c18a291793fda6a46f006bef41d93aa3f94ae6818d2b69ad27df0b5b4f6614
+  data.tar.gz: f6854e958070eaf6596b603f5aee2deacf41b68c70308a524adab089b658e609
 SHA512:
-  metadata.gz: 87b4a7374ee1f68ddcdbb0103219d50f8bdc6245a2497e3fa25b57335313e331892b8f4b9505683f305bcc4d59796b283f5c7b1c85fc9d02d5b498db1b6a9330
-  data.tar.gz: ed42b217b433e43cc3d336cd9c5c9ea30887bad7bf6399c0dcb5db7abd3f9f059e1e99c1e4bf72bf39ccbe2c9bef95fcc31c002840c039017e18ee976b50c428
+  metadata.gz: b98d89745b6419d64a2fb6e745791a715604e0c6aa28d2f52022648d71c322ca5c0b5c778f090e4a3ec88b3726a0a932357bd9aa41f900a4c8c807b9d24d01f7
+  data.tar.gz: 1c303c1587a238ab2c9042ae3d2e0efe7ad838fc7b53c0253db281f29ec6f43a461451b2475eb818e6c8fb610f3f71c4c7e82fd5412e42ea9bef309176629f22

data/fluent-plugin-opensearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'test-opensearch'
-  s.version       = '0.0.0.16'
+  s.version       = '0.0.0.18'
   s.authors       = ['Oleh']
   s.email         = ['imcotop@icloud.com']
   s.description   = %q{test}

data/lib/fluent/plugin/in_opensearch.rb

@@ -83,9 +83,9 @@ module Fluent::Plugin
     config_param :docinfo, :bool, :default => false
     config_param :check_connection, :bool, :default => true
     config_param :retry_forever, :bool, default: true, desc: 'If true, plugin will ignore retry_timeout and retry_max_times options and retry forever.'
-    config_param :retry_timeout, :time, default: 72 * 60 * 60, desc: 'The maximum seconds to retry to flush while failing, until plugin discards buffer chunks.'
+    config_param :retry_timeout, :time, default: 72 * 60 * 60, desc: 'The maximum seconds to retry'
     # 72hours == 17 times with exponential backoff (not to change default behavior)
-    config_param :retry_max_times, :integer, default: 5, desc: 'The maximum number of times to retry to flush while failing.'
+    config_param :retry_max_times, :integer, default: 5, desc: 'The maximum number of times to retry'
     # exponential backoff sequence will be initialized at the time of this threshold
     config_param :retry_type, :enum, list: [:exponential_backoff, :periodic], default: :exponential_backoff
     ### Periodic -> fixed :retry_wait
@@ -94,7 +94,7 @@ module Fluent::Plugin
     # b: base factor, @retry_exponential_backoff_base
     # k: times
     # total retry time: c + c * b^1 + (...) + c*b^k = c*b^(k+1) - 1
-    config_param :retry_wait, :time, default: 1, desc: 'Seconds to wait before next retry to flush, or constant factor of exponential backoff.'
+    config_param :retry_wait, :time, default: 1, desc: 'Seconds to wait before next retry , or constant factor of exponential backoff.'
     config_param :retry_exponential_backoff_base, :float, default: 2, desc: 'The base number of exponential backoff for retries.'
     config_param :retry_max_interval, :time, default: nil, desc: 'The maximum interval seconds for exponential backoff between retries while failing.'
     config_param :retry_randomize, :bool, default: false, desc: 'If true, output plugin will retry after randomized interval not to do burst retries.'
@@ -110,7 +110,7 @@ module Fluent::Plugin
 
       @timestamp_parser = create_time_parser
       @backend_options = backend_options
-      @retry = nil
+      @retry = retry_state(@retry_randomize)
 
       raise Fluent::ConfigError, "`password` must be present if `user` is present" if @user && @password.nil?
 
@@ -355,7 +355,7 @@ module Fluent::Plugin
       @retry.step
       # Check if the retry limit has been reached
       if @retry.limit?
-        raise Fluent::ConfigError, "Hit limit for retries. retry_times: #{@retry.steps} error: #{e.message}"
+        raise "Hit limit for retries. retry_times: #{@retry.steps} error: #{e.message}"
       else
         msg = "failed to connect or search."
         log.warn(msg, retry_times: @retry.steps, next_retry_time: @retry.next_time.round, error: e.message)
@@ -365,7 +365,6 @@ module Fluent::Plugin
     end
 
     def run_slice(slice_id=nil)
-      @retry = retry_state(@retry_randomize)
       slice_query = @base_query
       slice_query = slice_query.merge('slice' => { 'id' => slice_id, 'max' => @num_slices}) unless slice_id.nil?
       result = client.search(@options.merge(:body => Yajl.dump(slice_query) ))
@@ -383,7 +382,9 @@ module Fluent::Plugin
 
       router.emit_stream(@tag, es)
       clear_scroll(scroll_id)
-      @retry = nil
+      #reset steps and next_time if our function successful ends
+      @retry.instance_variable_set(:@steps, 0)
+      @retry.instance_variable_set(:@next_time, nil)
     end
 
     def clear_scroll(scroll_id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-opensearch
 version: !ruby/object:Gem::Version
-  version: 0.0.0.16
+  version: 0.0.0.18
 platform: ruby
 authors:
 - Oleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-19 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd