Skip to content

configure stall protection grace period through env var #1976

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

configure stall protection grace period through env var #1976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22b7bdf
configure stall protection grace period through env var
sivukhin Mar 9, 2025
7619de0
fix compilation
sivukhin Mar 9, 2025
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
17 changes: 16 additions & 1 deletion bottomless/src/replicator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ use anyhow::{anyhow, bail};
use arc_swap::ArcSwapOption;
use async_compression::tokio::write::{GzipEncoder, ZstdEncoder};
use aws_config::BehaviorVersion;
use aws_sdk_s3::config::{Credentials, Region, SharedCredentialsProvider};
use aws_sdk_s3::config::{
Credentials, Region, SharedCredentialsProvider, StalledStreamProtectionConfig,
};
use aws_sdk_s3::error::SdkError;
use aws_sdk_s3::operation::get_object::builders::GetObjectFluentBuilder;
use aws_sdk_s3::operation::get_object::GetObjectError;
Expand Down Expand Up @@ -125,6 +127,8 @@ pub struct Options {
pub skip_snapshot: bool,
/// Skip uploading snapshots on shutdown
pub skip_shutdown_upload: bool,
/// Stall protection grace period duration for AWS S3 client
pub stall_protection_grace_period: std::time::Duration,
}

impl Options {
Expand All @@ -145,8 +149,13 @@ impl Options {
"LIBSQL_BOTTOMLESS_AWS_SECRET_ACCESS_KEY was not set"
))?;
let session_token: Option<String> = self.session_token.clone();

let mut stall_protection = StalledStreamProtectionConfig::enabled();
stall_protection.set_grace_period(Some(self.stall_protection_grace_period));

let conf = loader
.behavior_version(BehaviorVersion::latest())
.stalled_stream_protection(stall_protection.build())
.region(Region::new(region))
.credentials_provider(SharedCredentialsProvider::new(Credentials::new(
access_key_id,
Expand Down Expand Up @@ -245,6 +254,11 @@ impl Options {
let skip_shutdown_upload =
env_var_or("LIBSQL_BOTTOMLESS_SKIP_SHUTDOWN_UPLOAD", false).parse::<bool>()?;

let stall_protection_grace_period_sec =
env_var_or("LIBSQL_S3_STALL_PROTECTION_GRACE_PERIOD_SEC", 20).parse::<u64>()?;
let stall_protection_grace_period =
std::time::Duration::from_secs(stall_protection_grace_period_sec);

Ok(Options {
db_id,
create_bucket_if_not_exists: true,
Expand All @@ -263,6 +277,7 @@ impl Options {
s3_max_retries,
skip_snapshot,
skip_shutdown_upload,
stall_protection_grace_period,
})
}
}
Expand Down
1 change: 1 addition & 0 deletions libsql-server/src/namespace/meta_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ pub async fn metastore_connection_maker(
s3_max_retries: 10,
skip_snapshot: false,
skip_shutdown_upload: false,
stall_protection_grace_period: std::time::Duration::from_secs(5 * 60),
};
let mut replicator = bottomless::replicator::Replicator::with_options(
db_path.join("data").to_str().unwrap(),
Expand Down
Loading