-
Notifications
You must be signed in to change notification settings - Fork 1.7k
fix(bigquery): avoid SSLError retry loop #17489
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
a343f9e
fix: don't retry ssl errors
daniel-sanche f5160fb
added context to error
daniel-sanche 75ac867
added system test
daniel-sanche b29cece
added project_id to system test
daniel-sanche 4180669
added auto-cleanup
daniel-sanche 9c4e8db
changed coverage requirement
daniel-sanche 2095b09
fixed lint
daniel-sanche fc2afd5
Update coverage threshold to 100%
daniel-sanche 9b57eb4
moved ssl error into unstructured_errors list
daniel-sanche fdd557d
added separate list for non-retryable exceptions
daniel-sanche c6d1a96
fixed lint
daniel-sanche File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
packages/google-cloud-bigquery/tests/system/test_ssl_retry.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| # Copyright 2026 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # https://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import time | ||
| from unittest import mock | ||
|
|
||
| import pytest | ||
| import requests.exceptions | ||
| from google.api_core import exceptions as core_exceptions | ||
| from google.cloud import bigquery | ||
|
|
||
| def test_insert_rows_json_ssl_error_no_retry(bigquery_client, dataset_id): | ||
| """ | ||
| Verify that SSLError during insert_rows_json is NOT retried and | ||
| propagates a descriptive error message immediately. | ||
| """ | ||
| table_id = f"{dataset_id}.test_ssl_retry_{int(time.time())}" | ||
| schema = [bigquery.SchemaField("name", "STRING")] | ||
| table = bigquery.Table(table_id, schema=schema) | ||
| bigquery_client.create_table(table) | ||
|
|
||
| # We mock the api_request to simulate the GFE abruptly closing the connection | ||
| # which manifests as a requests.exceptions.SSLError. | ||
| original_api_request = bigquery_client._connection.api_request | ||
| call_count = 0 | ||
|
|
||
| def mock_api_request(*args, **kwargs): | ||
| nonlocal call_count | ||
| call_count += 1 | ||
| raise requests.exceptions.SSLError("EOF occurred in violation of protocol") | ||
|
|
||
| with mock.patch.object(bigquery_client._connection, "api_request", side_effect=mock_api_request): | ||
| # Use a reasonably short deadline for the test, although it should fail on the first attempt anyway. | ||
| retry = bigquery.DEFAULT_RETRY.with_deadline(5.0) | ||
|
|
||
| start_time = time.time() | ||
| with pytest.raises(requests.exceptions.SSLError) as excinfo: | ||
| bigquery_client.insert_rows_json( | ||
| table, | ||
| [{"name": "test"}], | ||
| retry=retry | ||
| ) | ||
| duration = time.time() - start_time | ||
|
|
||
| # Verification: | ||
| # 1. It should NOT have retried (total calls should be 1) | ||
| assert call_count == 1 | ||
|
|
||
| # 2. It should have failed quickly (much less than the 5s deadline) | ||
| assert duration < 2.0 | ||
|
|
||
| # 3. The error message should contain our descriptive wrapping | ||
| assert "invalid table schema" in str(excinfo.value) | ||
| assert "SSL/Connection error occurred" in str(excinfo.value) | ||
|
|
||
| # Cleanup | ||
| bigquery_client.delete_table(table_id) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.