WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Fix: spawn task when opening new connection in acquire. #3516

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

Closed
joeydewaal wants to merge 5 commits into from
Closed

Fix: spawn task when opening new connection in acquire. #3516

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af89891
Spawn a task when calling acquire on sqlx::Pool
joeydewaal Sep 20, 2024
6e72469
remove space
joeydewaal Sep 20, 2024
9e03327
fix clippy warning
joeydewaal Sep 20, 2024
e32c121
Pool: check idle connections while opening a new one
joeydewaal Sep 21, 2024
a4e16d2
fix clippy warnings
joeydewaal Sep 21, 2024
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
8 changes: 7 additions & 1 deletion sqlx-core/src/pool/inner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,13 @@ impl<DB: Database> PoolInner<DB> {
};

// Attempt to connect...
return self.connect(deadline, guard).await;
let pool = self.clone();
return crate::rt::spawn(async move {
crate::rt::timeout(pool.options.connect_timeout, async move {
pool.connect(deadline, guard).await
}).await
}).await
.map_err(|_| Error::PoolTimedOut)?;
}
}
)
Expand Down
3 changes: 3 additions & 0 deletions sqlx-core/src/pool/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ pub struct PoolOptions<DB: Database> {
pub(crate) acquire_slow_level: LevelFilter,
pub(crate) acquire_slow_threshold: Duration,
pub(crate) acquire_timeout: Duration,
pub(crate) connect_timeout: Duration,
pub(crate) min_connections: u32,
pub(crate) max_lifetime: Option<Duration>,
pub(crate) idle_timeout: Option<Duration>,
Expand All @@ -102,6 +103,7 @@ impl<DB: Database> Clone for PoolOptions<DB> {
acquire_slow_threshold: self.acquire_slow_threshold,
acquire_slow_level: self.acquire_slow_level,
acquire_timeout: self.acquire_timeout,
connect_timeout: self.connect_timeout,
min_connections: self.min_connections,
max_lifetime: self.max_lifetime,
idle_timeout: self.idle_timeout,
Expand Down Expand Up @@ -158,6 +160,7 @@ impl<DB: Database> PoolOptions<DB> {
// to not flag typical time to add a new connection to a pool.
acquire_slow_threshold: Duration::from_secs(2),
acquire_timeout: Duration::from_secs(30),
connect_timeout: Duration::from_secs(30),
idle_timeout: Some(Duration::from_secs(10 * 60)),
max_lifetime: Some(Duration::from_secs(30 * 60)),
fair: true,
Expand Down