Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
- Fixed dsr error toast staying while navigating [#7149](https://github.com/ethyca/fides/pull/7149)
- Fixed repeatedly clicking "Delete" on custom fields causing multiple errors [#7115](https://github.com/ethyca/fides/pull/7115)

### Removed
- Removed erroneous async engine settings of the form `api_async_engine_keepalives_*` that would cause errors when set [#7171](https://github.com/ethyca/fides/pull/7171)


## [2.76.1](https://github.com/ethyca/fides/compare/2.76.0..2.76.1)

Expand Down
22 changes: 0 additions & 22 deletions src/fides/api/db/ctl_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@
ssl_ctx.verify_mode = ssl.CERT_REQUIRED
connect_args["ssl"] = ssl_ctx

if CONFIG.database.api_async_engine_keepalives_idle:
connect_args["keepalives_idle"] = CONFIG.database.api_async_engine_keepalives_idle
if CONFIG.database.api_async_engine_keepalives_interval:
connect_args["keepalives_interval"] = (
CONFIG.database.api_async_engine_keepalives_interval
)
if CONFIG.database.api_async_engine_keepalives_count:
connect_args["keepalives_count"] = CONFIG.database.api_async_engine_keepalives_count

# Parameters are hidden for security
async_engine = create_async_engine(
CONFIG.database.async_database_uri,
Expand Down Expand Up @@ -59,19 +50,6 @@
ssl_ctx.verify_mode = ssl.CERT_REQUIRED
readonly_connect_args["ssl"] = ssl_ctx

if CONFIG.database.api_async_engine_keepalives_idle:
readonly_connect_args["keepalives_idle"] = (
CONFIG.database.api_async_engine_keepalives_idle
)
if CONFIG.database.api_async_engine_keepalives_interval:
readonly_connect_args["keepalives_interval"] = (
CONFIG.database.api_async_engine_keepalives_interval
)
if CONFIG.database.api_async_engine_keepalives_count:
readonly_connect_args["keepalives_count"] = (
CONFIG.database.api_async_engine_keepalives_count
)

readonly_async_engine = create_async_engine(
CONFIG.database.async_readonly_database_uri,
connect_args=readonly_connect_args,
Expand Down
14 changes: 2 additions & 12 deletions src/fides/config/database_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ class DatabaseSettings(FidesSettings):
)

# Async Engine Settings
# Note: We purposely do not include async engine equivalents of the sync engine's
# keepalives_* settings as they are not supported by asyncpg.
Comment on lines +59 to +60
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

api_async_engine_pool_size: int = Field(
default=5,
description="Number of concurrent database connections Fides will use for async API requests. Note that the pool begins with no connections, but as they are requested the connections are maintained and reused up to this limit.",
Expand All @@ -64,18 +66,6 @@ class DatabaseSettings(FidesSettings):
default=10,
description="Number of additional 'overflow' concurrent database connections Fides will use for async API requests if the pool reaches the limit. These overflow connections are discarded afterwards and not maintained.",
)
api_async_engine_keepalives_idle: Optional[int] = Field(
default=None,
description="Number of seconds of inactivity before the client sends a TCP keepalive packet to verify the database connection is still alive.",
)
api_async_engine_keepalives_interval: Optional[int] = Field(
default=None,
description="Number of seconds between TCP keepalive retries if the initial keepalive packet receives no response. These are client-side retries.",
)
api_async_engine_keepalives_count: Optional[int] = Field(
default=None,
description="Maximum number of TCP keepalive retries before the client considers the connection dead and closes it.",
)
api_async_engine_pool_pre_ping: bool = Field(
default=True,
description="If true, the async engine will pre-ping connections to ensure they are still valid before using them.",
Expand Down
Loading