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 postgres: catch termination connection PSQLException #19623

Merged
merged 9 commits into from
Nov 29, 2022
Merged

Source postgres: catch termination connection PSQLException #19623

merged 9 commits into from
Nov 29, 2022

Conversation

sashaNeshcheret
Copy link
Contributor

What

Handle PSQLException: FATAL: terminating connection due to conflict with recovery as config error

How

Describe the solution

Recommended reading order

  1. x.java

🚨 User Impact 🚨

Are there any breaking changes? What is the end result perceived by the user? If yes, please merge this PR with the 🚨🚨 emoji so changelog authors can further highlight this if needed.

Pre-merge Checklist

Expand the relevant checklist and delete the others.

New Connector

Community member or Airbyter

  • Community member? Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
    • docs/integrations/README.md
    • airbyte-integrations/builds.md
  • PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • If new credentials are required for use in CI, add them to GSM. Instructions.
  • /test connector=connectors/<name> command is passing
  • New Connector version released on Dockerhub by running the /publish command described here
  • After the connector is published, connector added to connector index as described here
  • Seed specs have been re-generated by building the platform and committing the changes to the seed spec files, as described here
Updating a connector

Community member or Airbyter

  • Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • Changelog updated in docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
  • PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • If new credentials are required for use in CI, add them to GSM. Instructions.
  • /test connector=connectors/<name> command is passing
  • New Connector version released on Dockerhub and connector version bumped by running the /publish command described here
Connector Generator
  • Issue acceptance criteria met
  • PR name follows PR naming conventions
  • If adding a new generator, add it to the list of scaffold modules being tested
  • The generator test modules (all connectors with -scaffold in their name) have been updated with the latest scaffold by running ./gradlew :airbyte-integrations:connector-templates:generator:testScaffoldTemplates then checking in your changes
  • Documentation which references the generator is updated as needed

Tests

Unit

Put your unit tests output here.

Integration

Put your integration tests output here.

Acceptance

Put your acceptance tests output here.

@github-actions
Copy link
Contributor

github-actions bot commented Nov 18, 2022 •
edited
Loading

Affected Connector Report

NOTE ⚠️ Changes in this PR affect the following connectors. Make sure to do the following as needed:

  • Run integration tests
  • Bump connector or module version
  • Add changelog
  • Publish the new version

❌ Sources (31)
Connector Version Changelog Publish
source-alloydb 1.0.17 ✅ ✅
source-alloydb-strict-encrypt 1.0.17 ✅ ⚠
(not in seed)
source-bigquery 0.2.3 ✅ ✅
source-clickhouse 0.1.14 ✅ ✅
source-clickhouse-strict-encrypt 0.1.14 ✅ ⚠
(not in seed)
source-cockroachdb 0.1.18 ✅ ✅
source-cockroachdb-strict-encrypt 0.1.18 ✅ ⚠
(not in seed)
source-db2 0.1.16 ✅ ✅
source-db2-strict-encrypt 0.1.16 ✅ ⚠
(not in seed)
source-dynamodb 0.1.0 ❌
(changelog missing)		 ✅
source-e2e-test 2.1.3 ✅ ✅
source-e2e-test-cloud 2.1.1 ⚠
(doc not found)		 ⚠
(not in seed)
source-elasticsearch 0.1.0 ✅ ✅
source-jdbc 0.3.5 ⚠
(doc not found)		 ⚠
(not in seed)
source-kafka 0.2.2 ✅ ✅
source-mongodb-strict-encrypt 0.1.19 ⚠
(doc not found)		 ⚠
(not in seed)
source-mongodb-v2 0.1.19 ✅ ✅
source-mssql 0.4.25 ✅ ✅
source-mssql-strict-encrypt 0.4.25 ✅ ⚠
(not in seed)
source-mysql 1.0.14 ✅ ✅
source-mysql-strict-encrypt 1.0.14 ✅ ⚠
(not in seed)
source-oracle 0.3.21 ✅ ✅
source-oracle-strict-encrypt 0.3.21 ✅ ⚠
(not in seed)
source-postgres 1.0.29 ✅ ✅
source-postgres-strict-encrypt 1.0.29 ✅ ⚠
(not in seed)
source-redshift 0.3.15 ✅ ✅
source-relational-db 0.3.1 ⚠
(doc not found)		 ⚠
(not in seed)
source-scaffold-java-jdbc 0.1.0 ⚠
(doc not found)		 ⚠
(not in seed)
source-sftp 0.1.2 ✅ ✅
source-snowflake 0.1.26 ✅ ✅
source-tidb 0.2.1 ✅ ✅
  • See "Actionable Items" below for how to resolve warnings and errors.

❌ Destinations (46)
Connector Version Changelog Publish
destination-azure-blob-storage 0.1.6 ⚠
(doc not found)		 ✅
destination-bigquery 1.2.8 ✅ ✅
destination-bigquery-denormalized 1.2.8 ⚠
(doc not found)		 ✅
destination-cassandra 0.1.4 ❌
(changelog missing)		 ✅
destination-clickhouse 0.2.0 ✅ ✅
destination-clickhouse-strict-encrypt 0.2.0 ✅ ⚠
(not in seed)
destination-csv 0.2.10 ⚠
(doc not found)		 ✅
destination-databricks 0.3.1 ✅ ✅
destination-dev-null 0.2.7 ⚠
(doc not found)		 ⚠
(not in seed)
destination-doris 0.1.0 ❌
(changelog missing)		 ✅
destination-dynamodb 0.1.7 ✅ ✅
destination-e2e-test 0.2.4 ✅ ✅
destination-elasticsearch 0.1.6 ✅ ✅
destination-elasticsearch-strict-encrypt 0.1.6 ✅ ⚠
(not in seed)
destination-gcs 0.2.12 ✅ ✅
destination-iceberg 0.1.0 ❌
(changelog missing)		 ✅
destination-jdbc 0.3.14 ⚠
(doc not found)		 ⚠
(not in seed)
destination-kafka 0.1.10 ❌
(changelog missing)		 ✅
destination-keen 0.2.4 ❌
(changelog missing)		 ✅
destination-kinesis 0.1.5 ❌
(changelog missing)		 ✅
destination-local-json 0.2.11 ✅ ✅
destination-mariadb-columnstore 0.1.7 ✅ ✅
destination-mongodb 0.1.9 ✅ ✅
destination-mongodb-strict-encrypt 0.1.9 ✅ ⚠
(not in seed)
destination-mqtt 0.1.3 ✅ ✅
destination-mssql 0.1.22 ✅ ✅
destination-mssql-strict-encrypt 0.1.22 ✅ ⚠
(not in seed)
destination-mysql 0.1.20 ✅ ✅
destination-mysql-strict-encrypt ❌ 0.1.21
(mismatch: 0.1.20)		 ✅ ⚠
(not in seed)
destination-oracle 0.1.19 ✅ ✅
destination-oracle-strict-encrypt 0.1.19 ✅ ⚠
(not in seed)
destination-postgres 0.3.26 ✅ ✅
destination-postgres-strict-encrypt 0.3.26 ✅ ⚠
(not in seed)
destination-pubsub 0.1.6 ❌
(changelog missing)		 ✅
destination-pulsar 0.1.3 ❌
(changelog missing)		 ✅
destination-r2 0.1.0 ✅ ✅
destination-redis 0.1.4 ✅ ✅
destination-redpanda 0.1.0 ❌
(changelog missing)		 ✅
destination-redshift 0.3.51 ✅ ✅
destination-rockset 0.1.4 ❌
(changelog missing)		 ✅
destination-s3 0.3.17 ✅ ✅
destination-s3-glue 0.1.0 ❌
(changelog missing)		 ✅
destination-scylla 0.1.3 ✅ ✅
destination-snowflake 0.4.40 ✅ ✅
destination-tidb 0.1.0 ✅ ✅
destination-yugabytedb 0.1.0 ✅ ✅
  • See "Actionable Items" below for how to resolve warnings and errors.

✅ Other Modules (0)

Actionable Items

(click to expand)
Category Status Actionable Item
Version ❌
mismatch		 The version of the connector is different from its normal variant. Please bump the version of the connector.
⚠
doc not found		 The connector does not seem to have a documentation file. This can be normal (e.g. basic connector like source-jdbc is not published or documented). Please double-check to make sure that it is not a bug.
Changelog ⚠
doc not found		 The connector does not seem to have a documentation file. This can be normal (e.g. basic connector like source-jdbc is not published or documented). Please double-check to make sure that it is not a bug.
❌
changelog missing		 There is no chnagelog for the current version of the connector. If you are the author of the current version, please add a changelog.
Publish ⚠
not in seed		 The connector is not in the seed file (e.g. source_definitions.yaml), so its publication status cannot be checked. This can be normal (e.g. some connectors are cloud-specific, and only listed in the cloud seed file). Please double-check to make sure that it is not a bug.
❌
diff seed version		 The connector exists in the seed file, but the latest version is not listed there. This usually means that the latest version is not published. Please use the /publish command to publish the latest version.

@sashaNeshcheret sashaNeshcheret marked this pull request as ready for review November 21, 2022 19:19
@sashaNeshcheret sashaNeshcheret requested a review from a team as a code owner November 21, 2022 19:19
akashkulk
akashkulk reviewed Nov 21, 2022
View reviewed changes
...tions/bases/base-java/src/main/java/io/airbyte/integrations/util/ConnectorExceptionUtil.java
import java.util.Locale;
import java.util.function.Predicate;

public class ConnectorExceptionUtil {
Copy link
Contributor

Choose a reason for hiding this comment

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

nit : Can this just be a static class?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@akashkulk seems we cannot do it first level class, do you mean make methods as static?

akashkulk
akashkulk reviewed Nov 21, 2022
View reviewed changes
Copy link
Contributor

@akashkulk akashkulk left a comment

Choose a reason for hiding this comment

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

Good job - this looks good! Just some minor comments and adding tests.

@sashaNeshcheret
Copy link
Contributor Author

sashaNeshcheret commented Nov 24, 2022 •
edited by github-actions bot
Loading

/test connector=connectors/source-postgres

🕑 connectors/source-postgres https://github.com/airbytehq/airbyte/actions/runs/3540097298
✅ connectors/source-postgres https://github.com/airbytehq/airbyte/actions/runs/3540097298
No Python unittests run

Build Passed

Test summary info:

All Passed

@sashaNeshcheret
Copy link
Contributor Author

sashaNeshcheret commented Nov 24, 2022 •
edited by github-actions bot
Loading

/test connector=connectors/source-postgres-strict-encrypt

🕑 connectors/source-postgres-strict-encrypt https://github.com/airbytehq/airbyte/actions/runs/3540099567
✅ connectors/source-postgres-strict-encrypt https://github.com/airbytehq/airbyte/actions/runs/3540099567
No Python unittests run

Build Passed

Test summary info:

All Passed

@sashaNeshcheret
Copy link
Contributor Author

sashaNeshcheret commented Nov 29, 2022 •
edited by github-actions bot
Loading

/publish connector=connectors/source-postgres-strict-encrypt

🕑 Publishing the following connectors:
connectors/source-postgres-strict-encrypt
https://github.com/airbytehq/airbyte/actions/runs/3574554639


Connector Did it publish? Were definitions generated?
connectors/source-postgres-strict-encrypt ✅ ❌

if you have connectors that successfully published but failed definition generation, follow step 4 here ▶️

@sashaNeshcheret sashaNeshcheret temporarily deployed to more-secrets November 29, 2022 13:31 Inactive
@sashaNeshcheret sashaNeshcheret temporarily deployed to more-secrets November 29, 2022 13:31 Inactive
@sashaNeshcheret
Copy link
Contributor Author

sashaNeshcheret commented Nov 29, 2022 •
edited by github-actions bot
Loading

/publish connector=connectors/source-postgres

🕑 Publishing the following connectors:
connectors/source-postgres
https://github.com/airbytehq/airbyte/actions/runs/3574558884


Connector Did it publish? Were definitions generated?
connectors/source-postgres ✅ ✅

if you have connectors that successfully published but failed definition generation, follow step 4 here ▶️

@octavia-squidington-iii octavia-squidington-iii temporarily deployed to more-secrets November 29, 2022 14:22 Inactive
@octavia-squidington-iii octavia-squidington-iii temporarily deployed to more-secrets November 29, 2022 14:22 Inactive
@sashaNeshcheret sashaNeshcheret merged commit 92282de into master Nov 29, 2022
@sashaNeshcheret sashaNeshcheret deleted the omneshcheret/802-postgres-source-handle-terminate-connection-exeption branch November 29, 2022 14:47
sashaNeshcheret added a commit that referenced this pull request Nov 29, 2022
@sashaNeshcheret
Revert "Source postgres: mark termination connection PSQLException as…
8e5d078 
… config error (#19623)"

This reverts commit 92282de.
@sashaNeshcheret sashaNeshcheret mentioned this pull request Nov 29, 2022
Merged
sashaNeshcheret added a commit that referenced this pull request Nov 29, 2022
@sashaNeshcheret
Revert "Source postgres: mark termination connection PSQLException as…
494349f 
… config error (#19623)" (#19881)

This reverts commit 92282de.
bleonard
bleonard reviewed Nov 29, 2022
View reviewed changes
...tegrations/bases/base-java/src/main/java/io/airbyte/integrations/base/IntegrationRunner.java
import java.util.Scanner;
import java.util.Set;
import java.sql.SQLException;
import java.util.*;
Copy link
Contributor

Choose a reason for hiding this comment

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

This is probably too broad based on patterns.

@sashaNeshcheret sashaNeshcheret restored the omneshcheret/802-postgres-source-handle-terminate-connection-exeption branch November 30, 2022 17:25
@sashaNeshcheret sashaNeshcheret temporarily deployed to more-secrets November 30, 2022 17:27 Inactive
@sashaNeshcheret sashaNeshcheret temporarily deployed to more-secrets November 30, 2022 17:27 Inactive
@octavia-squidington-iii octavia-squidington-iii mentioned this pull request Nov 30, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bleonard bleonard bleonard left review comments

@akashkulk akashkulk akashkulk approved these changes

Assignees
No one assigned
Labels
area/connectors Connector related issues area/documentation Improvements or additions to documentation connectors/source/postgres connectors/source/postgres-strict-encrypt
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sashaNeshcheret @bleonard @akashkulk @octavia-squidington-iii @octavia-squidington-iv