fluent-plugin-bigquery-custom 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29b676254a53a8b69c023230819fdded3f53c8e2
-  data.tar.gz: 1b26aa639d74be661e5866c1c78a8fe8ec40e232
+  metadata.gz: 8fa069b1f44e40c71a9eaaeec2120e239a0dec38
+  data.tar.gz: c439e475ec1bd49f3f8b73b5e3d029b99ae521eb
 SHA512:
-  metadata.gz: 7f02605f56709c8beb093458050bfbacab13a286b7b3b5e720fbb1768aa20014a5410d29eb0dd98641eac9d17b245b0ce6e91811cf2419a4f9650e00381697ba
-  data.tar.gz: 7f45d681ade43daf9b5782eff2c87521af72606592f4f456cdce89148cc30ec55adf31ef998460a609a990124ccf4e2fe8666ff5a52892313c4eeef6fbd1f730
+  metadata.gz: d9ff3c9c78663f7b323b90ccb0243690d7c8385bca74fc9c360cedbae1c1687fea2f6adecf14077d8ddf2c01e625dbbe61b621682c6811f1871adbe280872ed6
+  data.tar.gz: 6494234184b5788b9888a4f99ca9d141aae7dac0a0d6bc10e71b9748f58f92f06ab0ee3d9665fced614f0dca10aa9db6a0c54846ad8910f507aa23191e78361f

data/lib/fluent/plugin/bigquery/version.rb

@@ -1,6 +1,6 @@
 module Fluent
   module BigQueryPlugin
-    VERSION = "0.3.7"
+    VERSION = "0.3.8"
   end
 end
 

data/lib/fluent/plugin/out_bigquery.rb

@@ -19,6 +19,8 @@ module Fluent
     # https://developers.google.com/bigquery/browser-tool-quickstart
     # https://developers.google.com/bigquery/bigquery-api-quickstart
 
+    RETRYABLE_ERROR_REASON = %w(backendError internalError rateLimitExceeded tableUnavailable).freeze
+
     ### default for insert
     def configure_for_insert(conf)
       raise ConfigError unless conf["method"] != "load"
@@ -463,7 +465,7 @@ module Fluent
             end
           end
 
-          raise "failed to insert into bigquery, retry" if reasons.find { |r| r == "backendError" }
+          raise "failed to insert into bigquery, retry" if reasons.find { |r| RETRYABLE_ERROR_REASON.include?(r) }
           return if reasons.all? { |r| r == "invalid" } && @skip_invalid_rows
           flush_secondary(@secondary) if @secondary
         end
@@ -480,10 +482,9 @@ module Fluent
         reason = e.respond_to?(:reason) ? e.reason : nil
         log.error "tabledata.insertAll API", project_id: @project, dataset: @dataset, table: table_id, code: e.status_code, message: e.message, reason: reason
 
-        raise "failed to insert into bigquery, retry" if reason == "backendError" # backendError is retryable. TODO: error class
-
-        # other error handling
-        if @secondary
+        if RETRYABLE_ERROR_REASON.include?(reason) || e.is_a?(Google::Apis::ServerError)
+          raise "failed to insert into bigquery, retry" # TODO: error class
+        elsif @secondary
           flush_secondary(@secondary)
         end
       end
@@ -536,11 +537,11 @@ module Fluent
         reason = e.respond_to?(:reason) ? e.reason : nil
         log.error "job.insert API", project_id: @project, dataset: @dataset, table: table_id, code: e.status_code, message: e.message, reason: reason
 
-        raise "failed to insert into bigquery, retry" if reason == "backendError" # backendError is retryable. TODO: error class
         return wait_load(job_id) if e.status_code == 409 && e.message =~ /Job/ # duplicate load job
 
-        # other error handling
-        if @secondary
+        if RETRYABLE_ERROR_REASON.include?(reason) || e.is_a?(Google::Apis::ServerError)
+          raise "failed to insert into bigquery, retry" # TODO: error class
+        elsif @secondary
           flush_secondary(@secondary)
         end
       end
@@ -607,7 +608,7 @@ module Fluent
         error_result = _response.status.error_result
         if error_result
           log.error "job.insert API (result)", project_id: @project, dataset: @dataset, table: table_id, message: error_result.message, reason: error_result.reason
-          if _response.status.error_result.reason == "backendError"
+          if RETRYABLE_ERROR_REASON.include?(error_result.reason)
             raise "failed to load into bigquery"
           elsif @secondary
             flush_secondary(@secondary)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-bigquery-custom
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Tomohiro Hashidate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake