influxdb-client 1.8.0.pre.1218 → 1.9.0.pre.1301

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e17817aa71b99fc2c00c9810031c7a1acbf86e3560b91e1ad277f0213ddd66
-  data.tar.gz: d58024ec56f0766126c06b829a49dce98ff83f85dda23990f0cd05d9f9917fc1
+  metadata.gz: 2d671be12047966afd88d59cf5d96f5422e1154bbd4d7698329fa90c4f382ed4
+  data.tar.gz: 93bc78686d5bdf9eedd526969e73d87a0356ea1ba9e21073e525f4ab6a956adf
 SHA512:
-  metadata.gz: 40fede72bad180624c088af3ee92f005ff2dfc357e330012f17b06284b939f8017c018b79bb36e3112a646361b57f492c8d7e45bb402b657ece43796657b7fe4
-  data.tar.gz: a1636a76698949e303c749fdcc2936faa31928d140baac04d0449fc1248afbf9c1b4fa2ff427dadd20932ffed512311abad7d682328caf96e39a68f19c096947
+  metadata.gz: b3425542284cf56e6c3531697bbe0edcdb24eab9e0fb2b90f675555eeaadac45c7edc316646bf72cf181383bad23ee3eae03c27078ff5f2048586d93fa12647d
+  data.tar.gz: 6ad395bd8498e81231b61701d8cb2c86aa268638a1c31ac50189aa6b7219d8f9466dbd79ff78242259bb4369c890951ef73b41de5611f41a0baa8aeb2cb9dc92

data/.circleci/config.yml

@@ -78,7 +78,7 @@ jobs:
         default: &default-ruby-image "circleci/ruby:2.6-stretch"
       influxdb-image:
         type: string
-        default: &default-influxdb-image "influxdb:2.0.0-beta"
+        default: &default-influxdb-image "influxdb:2.0.0-rc"
     docker:
       - image: << parameters.ruby-image >>
       - image: &influx-image quay.io/influxdb/<< parameters.influxdb-image >>

data/CHANGELOG.md

@@ -1,11 +1,17 @@
-## 1.8.0 [unreleased]
+## 1.9.0 [unreleased]
+
+## 1.8.0 [2020-10-02]
 
 ### Features
 1. [#36](https://github.com/influxdata/influxdb-client-ruby/issues/36): Added support for default tags
+1. [#53](https://github.com/influxdata/influxdb-client-ruby/pull/53): Default strategy for batching worker is best-effort
 
 ### API
 1. [#50](https://github.com/influxdata/influxdb-client-ruby/pull/50): Default port changed from 9999 -> 8086
  
+### Bug Fixes
+1. [#52](https://github.com/influxdata/influxdb-client-ruby/pull/52): Fixed aborting of background threads
+
 ## 1.7.0 [2020-08-14]
 
 ### Features

data/README.md

@@ -23,7 +23,7 @@ The client can be installed manually or with bundler.
 To install the client gem manually:
 
 ```
-gem install influxdb-client -v 1.7.0
+gem install influxdb-client -v 1.8.0
 ```
 
 ## Usage
@@ -128,6 +128,7 @@ The writes are processed in batches which are configurable by `WriteOptions`:
 | max_retries | the number of max retries when write fails | 5 |
 | max_retry_delay | maximum delay when retrying write in milliseconds | 180000 |
 | exponential_base | the base for the exponential retry delay, the next delay is computed as `retry_interval * exponential_base^(attempts - 1) + random(jitter_interval)` | 5 |
+| batch_abort_on_exception | the batching worker will be aborted after failed retry strategy | false |
 ```ruby
 write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
                                             batch_size: 10, flush_interval: 5_000, 

data/bin/influxdb-restart.sh

@@ -27,7 +27,7 @@ DEFAULT_DOCKER_REGISTRY="quay.io/influxdb/"
 DOCKER_REGISTRY="${DOCKER_REGISTRY:-$DEFAULT_DOCKER_REGISTRY}"
 
 DEFAULT_INFLUXDB_V2_REPOSITORY="influxdb"
-DEFAULT_INFLUXDB_V2_VERSION="2.0.0-beta"
+DEFAULT_INFLUXDB_V2_VERSION="2.0.0-rc"
 INFLUXDB_V2_REPOSITORY="${INFLUXDB_V2_REPOSITORY:-$DEFAULT_INFLUXDB_V2_REPOSITORY}"
 INFLUXDB_V2_VERSION="${INFLUXDB_V2_VERSION:-$DEFAULT_INFLUXDB_V2_VERSION}"
 INFLUXDB_V2_IMAGE=${DOCKER_REGISTRY}${INFLUXDB_V2_REPOSITORY}:${INFLUXDB_V2_VERSION}

data/lib/influxdb2/client/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module InfluxDB2
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.9.0'.freeze
 end

data/lib/influxdb2/client/worker.rb

@@ -31,14 +31,13 @@ module InfluxDB2
 
       @queue_event.push(true)
 
-      Thread.abort_on_exception = true
-
       @thread_flush = Thread.new do
         until api_client.closed
           sleep @write_options.flush_interval.to_f / 1_000
           _check_background_queue
         end
       end
+      @thread_flush.abort_on_exception = @write_options.batch_abort_on_exception
 
       @thread_size = Thread.new do
         until api_client.closed
@@ -46,6 +45,7 @@ module InfluxDB2
           sleep 0.01
         end
       end
+      @thread_size.abort_on_exception = @write_options.batch_abort_on_exception
     end
 
     def push(payload)

data/lib/influxdb2/client/write_api.rb

@@ -39,8 +39,10 @@ module InfluxDB2
     #   by a random amount
     # @param [Integer] exponential_base: base for the exponential retry delay, the next delay is computed as
     #   "exponential_base^(attempts-1) + random(jitter_interval)"
+    # @param [Boolean] batch_abort_on_exception: batching worker will be aborted after failed retry strategy
     def initialize(write_type: WriteType::SYNCHRONOUS, batch_size: 1_000, flush_interval: 1_000, retry_interval: 5_000,
-                   jitter_interval: 0, max_retries: 5, max_retry_delay: 180_000, exponential_base: 5)
+                   jitter_interval: 0, max_retries: 5, max_retry_delay: 180_000, exponential_base: 5,
+                   batch_abort_on_exception: false)
       _check_not_negative('batch_size', batch_size)
       _check_not_negative('flush_interval', flush_interval)
       _check_not_negative('retry_interval', retry_interval)
@@ -56,10 +58,11 @@ module InfluxDB2
       @max_retries = max_retries
       @max_retry_delay = max_retry_delay
       @exponential_base = exponential_base
+      @batch_abort_on_exception = batch_abort_on_exception
     end
 
     attr_reader :write_type, :batch_size, :flush_interval, :retry_interval, :jitter_interval,
-                :max_retries, :max_retry_delay, :exponential_base
+                :max_retries, :max_retry_delay, :exponential_base, :batch_abort_on_exception
 
     def _check_not_negative(key, value)
       raise ArgumentError, "The '#{key}' should be positive or zero, but is: #{value}" if value <= 0

data/test/influxdb/delete_api_integration_test.rb

@@ -73,12 +73,16 @@ class DeleteApiIntegrationTest < MiniTest::Test
   end
 
   def test_delete_all
+    # TODO: https://github.com/influxdata/influxdb/issues/19545
+    skip
     @client.create_delete_api.delete(Time.utc(2010, 10, 15, 7, 20, 15), Time.utc(2020, 10, 14, 8, 20, 15))
 
     assert_equal 0, _query_count
   end
 
   def test_delete_without_interval
+    # TODO: https://github.com/influxdata/influxdb/issues/19545
+    skip
     error = assert_raises InfluxDB2::InfluxError do
       @client.create_delete_api.delete(nil, nil)
     end

data/test/influxdb/write_api_batching_test.rb

@@ -338,38 +338,34 @@ class WriteApiRetryStrategyTest < MiniTest::Test
                                                 batch_size: 1, retry_interval: 2_000, max_retries: 3,
                                                 max_retry_delay: 5_000, exponential_base: 2)
 
-    error = assert_raises InfluxDB2::InfluxError do
-      @client.create_write_api(write_options: write_options).write(data: point)
-
-      sleep(0.5)
+    @client.create_write_api(write_options: write_options).write(data: point)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 1, body: request)
+    sleep(0.5)
 
-      sleep(2)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 2, body: request)
+    sleep(2)
 
-      sleep(4)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 2, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 3, body: request)
+    sleep(4)
 
-      sleep(5)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 3, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 4, body: request)
+    sleep(5)
 
-      sleep(5)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 4, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 4, body: request)
+    sleep(5)
 
-      sleep(5)
-    end
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 4, body: request)
 
-    assert_equal('429', error.code)
+    sleep(5)
 
     assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
                      times: 4, body: request)
@@ -384,7 +380,8 @@ class WriteApiRetryStrategyTest < MiniTest::Test
 
     write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
                                                 batch_size: 1, retry_interval: 2_000, max_retries: 3,
-                                                max_retry_delay: 5_000, exponential_base: 2)
+                                                max_retry_delay: 5_000, exponential_base: 2,
+                                                batch_abort_on_exception: true)
 
     error = assert_raises InfluxDB2::InfluxError do
       @client.create_write_api(write_options: write_options).write(data: 'h2o,location=west value=33i 15')
@@ -420,33 +417,29 @@ class WriteApiRetryStrategyTest < MiniTest::Test
                                                 batch_size: 1, retry_interval: 2_000, max_retries: 3,
                                                 max_retry_delay: 5_000, exponential_base: 2)
 
-    error = assert_raises InfluxDB2::InfluxError do
-      @client.create_write_api(write_options: write_options).write(data: point)
-
-      sleep(0.5)
+    @client.create_write_api(write_options: write_options).write(data: point)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 1, body: request)
+    sleep(0.5)
 
-      sleep(3)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 2, body: request)
+    sleep(3)
 
-      sleep(3)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 2, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 3, body: request)
+    sleep(3)
 
-      sleep(3)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 3, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 4, body: request)
+    sleep(3)
 
-      sleep(3)
-    end
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 4, body: request)
 
-    assert_equal('429', error.code)
+    sleep(3)
 
     assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
                      times: 4, body: request)
@@ -473,38 +466,37 @@ class WriteApiRetryStrategyTest < MiniTest::Test
                                                 batch_size: 1, retry_interval: 2_000, max_retries: 3,
                                                 max_retry_delay: 5_000, exponential_base: 2)
 
-    error = assert_raises InfluxDB2::InfluxError do
-      @client.create_write_api(write_options: write_options).write(data: point)
+    @client.create_write_api(write_options: write_options).write(data: point)
 
-      sleep(0.5)
+    sleep(0.5)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 1, body: request)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request)
 
-      sleep(2)
+    sleep(2)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 2, body: request)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 2, body: request)
 
-      sleep(4)
+    sleep(4)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 3, body: request)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 3, body: request)
 
-      sleep(5)
+    sleep(5)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 4, body: request)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 4, body: request)
 
-      sleep(5)
+    sleep(5)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 4, body: request)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 4, body: request)
 
-      sleep(5)
-    end
+    sleep(5)
 
-    assert_equal('Connection refused - ' + error_message, error.message)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 4, body: request)
   end
 
   def test_write_connection_error
@@ -545,4 +537,61 @@ class WriteApiRetryStrategyTest < MiniTest::Test
     assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
                      times: 3, body: request)
   end
+
+  def test_abort_on_exception
+    error_body = '{"code":"invalid","message":"unable to parse '\
+                 '\'h2o,location=europe 1\'"}'
+
+    stub_request(:any, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 400, headers: { 'X-Platform-Error-Code' => 'invalid' }, body: error_body)
+      .to_return(status: 204)
+
+    write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
+                                                batch_size: 1, retry_interval: 500, max_retries: 1,
+                                                max_retry_delay: 5_000, exponential_base: 1,
+                                                batch_abort_on_exception: true)
+
+    write_api = @client.create_write_api(write_options: write_options)
+
+    error = assert_raises InfluxDB2::InfluxError do
+      write_api.write(data: 'h2o,location=europe 1')
+      write_api.write(data: 'h2o,location=europe level=2.0 1')
+
+      sleep(2)
+    end
+
+    assert_equal("unable to parse 'h2o,location=europe 1'", error.message)
+
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: 'h2o,location=europe 1')
+
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 0, body: 'h2o,location=europe level=2.0 1')
+  end
+
+  def test_abort_on_exception_next_batch
+    error_body = '{"code":"invalid","message":"unable to parse '\
+                 '\'h2o,location=europe 1\'"}'
+
+    stub_request(:any, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 400, headers: { 'X-Platform-Error-Code' => 'invalid' }, body: error_body)
+      .to_return(status: 204)
+
+    write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
+                                                batch_size: 1, retry_interval: 500, max_retries: 1,
+                                                max_retry_delay: 5_000, exponential_base: 1)
+
+    write_api = @client.create_write_api(write_options: write_options)
+
+    write_api.write(data: 'h2o,location=europe 1')
+    write_api.write(data: 'h2o,location=europe level=2.0 1')
+
+    sleep(2)
+
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: 'h2o,location=europe 1')
+
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: 'h2o,location=europe level=2.0 1')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre.1218
+  version: 1.9.0.pre.1301
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler