🐛 Fixed connection leak in StreamingJdbcDatabase #20888

VitaliiMaltsev · 2022-12-27T13:58:27Z

What

When a JDBC source throwing SQLException, reading it in a streaming does not ever reach the onClose method of the stream, which is supposed to close the connection and now it is not executed, leaving the connection open.
throwing an Exception in tryAdvance() method can not be properly handled in StreamSpliterator

How

Handle exception on upper level when onClose method triggered

Before (connection never closed)

After (connection closed and exception is thrown)

🚨 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

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.

VitaliiMaltsev · 2022-12-27T13:59:07Z

/test connector=connectors/source-redshift

🕑 connectors/source-redshift https://github.com/airbytehq/airbyte/actions/runs/3787904577
✅ connectors/source-redshift https://github.com/airbytehq/airbyte/actions/runs/3787904577
Python tests coverage:

	 Name                                                 Stmts   Miss  Cover   Missing
	 ----------------------------------------------------------------------------------
	 source_acceptance_test/base.py                          12      4    67%   16-19
	 source_acceptance_test/config.py                       140      5    96%   87, 93, 238, 242-243
	 source_acceptance_test/conftest.py                     208     92    56%   36, 42-44, 49, 54, 77, 83, 89-91, 110, 115-117, 123-125, 131-132, 137-138, 143, 149, 158-167, 173-178, 193, 217, 248, 254, 262-267, 275-280, 288-301, 306-312, 319-330, 337-353
	 source_acceptance_test/plugin.py                        69     25    64%   22-23, 31, 36, 120-140, 144-148
	 source_acceptance_test/tests/test_core.py              402    115    71%   53, 58, 93-104, 109-116, 120-121, 125-126, 308, 346-363, 376-387, 391-396, 402, 435-440, 478-485, 528-530, 533, 598-606, 618-621, 626, 682-683, 689, 692, 728-738, 751-776
	 source_acceptance_test/tests/test_incremental.py       158     14    91%   52-59, 64-77, 240
	 source_acceptance_test/utils/asserts.py                 39      2    95%   62-63
	 source_acceptance_test/utils/common.py                  94     10    89%   16-17, 32-38, 72, 75
	 source_acceptance_test/utils/compare.py                 62     23    63%   21-51, 68, 97-99
	 source_acceptance_test/utils/connector_runner.py       133     33    75%   24-27, 46-47, 50-54, 57-58, 73-75, 78-80, 83-85, 88-90, 93-95, 124-125, 159-161, 208
	 source_acceptance_test/utils/json_schema_helper.py     107     13    88%   30-31, 38, 41, 65-68, 96, 120, 192-194
	 ----------------------------------------------------------------------------------
	 TOTAL                                                 1603    336    79%

Build Passed

Test summary info:

=========================== short test summary info ============================
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/tests/test_core.py:94: The previous and actual specifications are identical.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/tests/test_core.py:377: The previous and actual discovered catalogs are identical.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/tests/test_incremental.py:26: `future_state` not specified, skipping.
================== 27 passed, 3 skipped in 196.98s (0:03:16) ===================

VitaliiMaltsev · 2022-12-27T13:59:33Z

/test connector=connectors/source-cockroachdb

🕑 connectors/source-cockroachdb https://github.com/airbytehq/airbyte/actions/runs/3787906282
✅ connectors/source-cockroachdb https://github.com/airbytehq/airbyte/actions/runs/3787906282
Python tests coverage:

	 Name                                                 Stmts   Miss  Cover   Missing
	 ----------------------------------------------------------------------------------
	 source_acceptance_test/base.py                          12      4    67%   16-19
	 source_acceptance_test/config.py                       140      5    96%   87, 93, 238, 242-243
	 source_acceptance_test/conftest.py                     208     92    56%   36, 42-44, 49, 54, 77, 83, 89-91, 110, 115-117, 123-125, 131-132, 137-138, 143, 149, 158-167, 173-178, 193, 217, 248, 254, 262-267, 275-280, 288-301, 306-312, 319-330, 337-353
	 source_acceptance_test/plugin.py                        69     25    64%   22-23, 31, 36, 120-140, 144-148
	 source_acceptance_test/tests/test_core.py              402    115    71%   53, 58, 93-104, 109-116, 120-121, 125-126, 308, 346-363, 376-387, 391-396, 402, 435-440, 478-485, 528-530, 533, 598-606, 618-621, 626, 682-683, 689, 692, 728-738, 751-776
	 source_acceptance_test/tests/test_incremental.py       158     14    91%   52-59, 64-77, 240
	 source_acceptance_test/utils/asserts.py                 39      2    95%   62-63
	 source_acceptance_test/utils/common.py                  94     10    89%   16-17, 32-38, 72, 75
	 source_acceptance_test/utils/compare.py                 62     23    63%   21-51, 68, 97-99
	 source_acceptance_test/utils/connector_runner.py       133     33    75%   24-27, 46-47, 50-54, 57-58, 73-75, 78-80, 83-85, 88-90, 93-95, 124-125, 159-161, 208
	 source_acceptance_test/utils/json_schema_helper.py     107     13    88%   30-31, 38, 41, 65-68, 96, 120, 192-194
	 ----------------------------------------------------------------------------------
	 TOTAL                                                 1603    336    79%

Build Passed

Test summary info:

=========================== short test summary info ============================
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/plugin.py:63: Skipping TestConnection.test_check: not found in the config.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/plugin.py:63: Skipping TestDiscovery.test_discover: not found in the config.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/plugin.py:63: Skipping TestBasicRead.test_read: not found in the config.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/plugin.py:63: Skipping TestFullRefresh.test_sequential_reads: not found in the config.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/plugin.py:63: Skipping TestIncremental.test_two_sequential_reads: not found in the config.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/tests/test_core.py:94: The previous and actual specifications are identical.
================= 13 passed, 6 skipped, 21 warnings in 15.05s ==================

VitaliiMaltsev · 2022-12-27T16:44:14Z

/test connector=connectors/source-postgres

🕑 connectors/source-postgres https://github.com/airbytehq/airbyte/actions/runs/3788776364
✅ connectors/source-postgres https://github.com/airbytehq/airbyte/actions/runs/3788776364
Python tests coverage:

	 Name                                                 Stmts   Miss  Cover   Missing
	 ----------------------------------------------------------------------------------
	 source_acceptance_test/base.py                          12      4    67%   16-19
	 source_acceptance_test/config.py                       140      5    96%   87, 93, 238, 242-243
	 source_acceptance_test/conftest.py                     208     92    56%   36, 42-44, 49, 54, 77, 83, 89-91, 110, 115-117, 123-125, 131-132, 137-138, 143, 149, 158-167, 173-178, 193, 217, 248, 254, 262-267, 275-280, 288-301, 306-312, 319-330, 337-353
	 source_acceptance_test/plugin.py                        69     25    64%   22-23, 31, 36, 120-140, 144-148
	 source_acceptance_test/tests/test_core.py              402    115    71%   53, 58, 93-104, 109-116, 120-121, 125-126, 308, 346-363, 376-387, 391-396, 402, 435-440, 478-485, 528-530, 533, 598-606, 618-621, 626, 682-683, 689, 692, 728-738, 751-776
	 source_acceptance_test/tests/test_incremental.py       158     14    91%   52-59, 64-77, 240
	 source_acceptance_test/utils/asserts.py                 39      2    95%   62-63
	 source_acceptance_test/utils/common.py                  94     10    89%   16-17, 32-38, 72, 75
	 source_acceptance_test/utils/compare.py                 62     23    63%   21-51, 68, 97-99
	 source_acceptance_test/utils/connector_runner.py       133     33    75%   24-27, 46-47, 50-54, 57-58, 73-75, 78-80, 83-85, 88-90, 93-95, 124-125, 159-161, 208
	 source_acceptance_test/utils/json_schema_helper.py     107     13    88%   30-31, 38, 41, 65-68, 96, 120, 192-194
	 ----------------------------------------------------------------------------------
	 TOTAL                                                 1603    336    79%

Build Passed

Test summary info:

=========================== short test summary info ============================
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/plugin.py:63: Skipping TestConnection.test_check: not found in the config.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/plugin.py:63: Skipping TestDiscovery.test_discover: not found in the config.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/plugin.py:63: Skipping TestBasicRead.test_read: not found in the config.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/plugin.py:63: Skipping TestFullRefresh.test_sequential_reads: not found in the config.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/plugin.py:63: Skipping TestIncremental.test_two_sequential_reads: not found in the config.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/source_acceptance_test/tests/test_core.py:94: The previous and actual specifications are identical.
================= 13 passed, 6 skipped, 21 warnings in 17.88s ==================

akashkulk · 2023-01-20T17:57:22Z

Can you link the original bug here?

VitaliiMaltsev · 2023-01-22T14:00:23Z

Can you link the original bug here?

linked

…ak' into vmaltsev/10128-prevent-stream-leak

github-actions · 2023-01-22T15:26:38Z

Airbyte Code Coverage

File	Coverage [40.6%]	❌
StreamingJdbcDatabase.java	74.83%	🍏
JdbcDatabase.java	21.48%	❌

Total Project Coverage	26.73%	🍏

Fixed connection leak in StreamingJdbcDatabase

836151c

VitaliiMaltsev temporarily deployed to more-secrets December 27, 2022 13:59 — with GitHub Actions Inactive

VitaliiMaltsev temporarily deployed to more-secrets December 27, 2022 14:00 — with GitHub Actions Inactive

VitaliiMaltsev marked this pull request as ready for review December 28, 2022 13:50

VitaliiMaltsev requested review from akashkulk and rodireich December 28, 2022 13:51

rodireich approved these changes Jan 17, 2023

View reviewed changes

akashkulk approved these changes Jan 20, 2023

View reviewed changes

Merge branch 'master' into vmaltsev/10128-prevent-stream-leak

6d176c3

VitaliiMaltsev linked an issue Jan 22, 2023 that may be closed by this pull request

Make sure we close the connection and don't leak it in java sources. #10128

Closed

VitaliiMaltsev temporarily deployed to more-secrets January 22, 2023 13:59 — with GitHub Actions Inactive

VitaliiMaltsev added 3 commits January 22, 2023 17:06

Merge branch 'master' into vmaltsev/10128-prevent-stream-leak

c856aee

fixed checkstyle

519da93

Merge remote-tracking branch 'origin/vmaltsev/10128-prevent-stream-le…

6d2e37d

…ak' into vmaltsev/10128-prevent-stream-leak

VitaliiMaltsev temporarily deployed to more-secrets January 22, 2023 15:12 — with GitHub Actions Inactive

VitaliiMaltsev merged commit 126ce36 into master Jan 22, 2023

VitaliiMaltsev deleted the vmaltsev/10128-prevent-stream-leak branch January 22, 2023 16:03

octavia-squidington-iii mentioned this pull request Jan 24, 2023

Bump Airbyte version from 0.40.28 to 0.40.29 #21767

Merged

akashkulk mentioned this pull request Jun 9, 2023

Fix issue in streaming JDBC database #27212

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🐛 Fixed connection leak in StreamingJdbcDatabase #20888

🐛 Fixed connection leak in StreamingJdbcDatabase #20888

VitaliiMaltsev commented Dec 27, 2022 •

edited

Loading

VitaliiMaltsev commented Dec 27, 2022 •

edited by github-actions bot

Loading

VitaliiMaltsev commented Dec 27, 2022 •

edited by github-actions bot

Loading

VitaliiMaltsev commented Dec 27, 2022 •

edited by github-actions bot

Loading

akashkulk commented Jan 20, 2023

VitaliiMaltsev commented Jan 22, 2023

github-actions bot commented Jan 22, 2023

🐛 Fixed connection leak in StreamingJdbcDatabase #20888

🐛 Fixed connection leak in StreamingJdbcDatabase #20888

Conversation

VitaliiMaltsev commented Dec 27, 2022 • edited Loading

What

How

🚨 User Impact 🚨

Pre-merge Checklist

Community member or Airbyter

Airbyter

Community member or Airbyter

Airbyter

Tests

VitaliiMaltsev commented Dec 27, 2022 • edited by github-actions bot Loading

Build Passed

VitaliiMaltsev commented Dec 27, 2022 • edited by github-actions bot Loading

Build Passed

VitaliiMaltsev commented Dec 27, 2022 • edited by github-actions bot Loading

Build Passed

akashkulk commented Jan 20, 2023

VitaliiMaltsev commented Jan 22, 2023

github-actions bot commented Jan 22, 2023

Airbyte Code Coverage

VitaliiMaltsev commented Dec 27, 2022 •

edited

Loading

VitaliiMaltsev commented Dec 27, 2022 •

edited by github-actions bot

Loading

VitaliiMaltsev commented Dec 27, 2022 •

edited by github-actions bot

Loading

VitaliiMaltsev commented Dec 27, 2022 •

edited by github-actions bot

Loading