Merge branch 'upstream_master' into merge_upstream

mzumi · mzumi · commit b8f4f27602f5 · 2023-03-22T16:39:25.000+09:00
# Conflicts:
#	embulk-output-bigquery.gemspec
#	lib/embulk/output/bigquery/google_client.rb
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.6.9 - 2023-03-16
+* [enhancement] Add SSLException to retry job (thanks to @mzumi)
+
 ## 0.6.8 - 2022-10-12
 * [enhancement] Support JSON type (thanks to @civitaspo )
 * [maintenance] Add an error message in order to retry (thanks to @mzumi)
diff --git a/lib/embulk/output/bigquery/google_client.rb b/lib/embulk/output/bigquery/google_client.rb
@@ -72,6 +72,7 @@ def with_network_retry(&block)
               raise e
             end
           rescue ::Java::Java.net.SocketException, ::Java::Java.net.ConnectException => e
+          rescue ::Java::Java.net.SocketException, ::Java::Java.net.ConnectException, ::Java::JavaxNetSsl::SSLException => e
             retry_messages = [
               'Broken pipe',
               'Connection reset',
