Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Source File: add retry on SSHException('Error reading SSH protocol banner') - 2 #26210

Merged
merged 5 commits into from
May 17, 2023
Merged

Source File: add retry on SSHException('Error reading SSH protocol banner') - 2 #26210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a863db4
bump 0.3.8
grubberr May 17, 2023
6ef3a8e
file.md updated
grubberr May 17, 2023
f3fb629
Automated Change
grubberr May 17, 2023
7bac023
test_urlfile_open_backoff_sftp - improved
grubberr May 17, 2023
d19dd3e
Merge branch 'grubberr/oncall-1954-source-file-2' of github.com:airby…
grubberr May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airbyte-config-oss/init-oss/src/main/resources/seed/oss_registry.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/source-file-secure/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM airbyte/source-file:0.3.7
FROM airbyte/source-file:0.3.8

WORKDIR /airbyte/integration_code
COPY source_file_secure ./source_file_secure
Expand All @@ -9,5 +9,5 @@ RUN pip install .
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.3.7
LABEL io.airbyte.version=0.3.8
LABEL io.airbyte.name=airbyte/source-file-secure
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-file-secure/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ data:
connectorSubtype: file
connectorType: source
definitionId: 778daa7c-feaf-4db6-96f3-70fd645acc77
dockerImageTag: 0.3.7
dockerImageTag: 0.3.8
dockerRepository: airbyte/source-file-secure
githubIssueLabel: source-file
icon: file.svg
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-file/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ COPY source_file ./source_file
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.3.7
LABEL io.airbyte.version=0.3.8
LABEL io.airbyte.name=airbyte/source-file
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/source-file/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ data:
connectorSubtype: file
connectorType: source
definitionId: 778daa7c-feaf-4db6-96f3-70fd645acc77
dockerImageTag: 0.3.7
dockerImageTag: 0.3.8
dockerRepository: airbyte/source-file
githubIssueLabel: source-file
icon: file.svg
Expand All @@ -14,7 +14,7 @@ data:
registries:
cloud:
dockerRepository: airbyte/source-file-secure
dockerImageTag: 0.3.7 # Dont forget to publish source-file-secure as well when updating this.
dockerImageTag: 0.3.8 # Dont forget to publish source-file-secure as well when updating this.
enabled: true
oss:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-file/source_file/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def close(self):

def backoff_giveup(self, error):
# https://github.com/airbytehq/oncall/issues/1954
if isinstance(error, SSHException) and str(error) == "Error reading SSH protocol banner":
if isinstance(error, SSHException) and str(error).startswith("Error reading SSH protocol banner"):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we have a test changing in that case?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

improved

# We need to clear smart_open internal _SSH cache from the previous attempt, otherwise:
# SSHException('SSH session not active')
# will be raised
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-file/unit_tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def patched_open(self):
nonlocal call_count
call_count += 1
if call_count < 7:
raise SSHException("Error reading SSH protocol banner")
raise SSHException("Error reading SSH protocol banner[Errno 104] Connection reset by peer")
return result

sleep_mock = mocker.patch("time.sleep")
Expand Down
1 change: 1 addition & 0 deletions docs/integrations/sources/file.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ In order to read large files from a remote location, this connector uses the [sm

| Version | Date | Pull Request | Subject |
|:--------|:-----------|:---------------------------------------------------------|:--------------------------------------------------------------------------------------------------------|
| 0.3.8 | 2023-05-17 | [26210](https://github.com/airbytehq/airbyte/pull/26210) | Bugfix for https://github.com/airbytehq/airbyte/pull/26115 |
| 0.3.7 | 2023-05-16 | [26131](https://github.com/airbytehq/airbyte/pull/26131) | Re-release source-file to be in sync with source-file-secure |
| 0.3.6 | 2023-05-16 | [26115](https://github.com/airbytehq/airbyte/pull/26115) | Add retry on SSHException('Error reading SSH protocol banner') |
| 0.3.5 | 2023-05-16 | [26117](https://github.com/airbytehq/airbyte/pull/26117) | Check if reader options is a valid JSON object |
Expand Down
Loading