Skip to content

fix(cloudfront): hold a function to a CPU-time budget, not wall-clock time #2523

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

Merged
vieiralucas merged 5 commits into from
Sep 14, 2026
Merged

fix(cloudfront): hold a function to a CPU-time budget, not wall-clock time #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45a46f6
fix(cloudfront): hold a function to a CPU-time budget, not wall-clock…
vieiralucas Sep 14, 2026
d41f734
fix(cloudfront): stop a function at its CPU budget while it runs
vieiralucas Sep 14, 2026
8ed84b4
fix(cloudfront): measure the watchdog from the worker's own start rea…
vieiralucas Sep 14, 2026
b6025a7
fix(cloudfront): wait on a function handler off the async runtime
vieiralucas Sep 14, 2026
f32caab
Merge remote-tracking branch 'origin/main' into fix/cloudfront-functi…
vieiralucas Sep 14, 2026
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions crates/fakecloud-cloudfront/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ thiserror = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }
uuid = { workspace = true }

[target.'cfg(unix)'.dependencies]
libc = "0.2"
32 changes: 17 additions & 15 deletions crates/fakecloud-cloudfront/src/cfunctions_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ impl CloudFrontService {
Ok(xml_with_etag(StatusCode::OK, body, &snap.etag, None))
}

pub(crate) fn test_connection_function(
pub(crate) async fn test_connection_function(
&self,
req: &AwsRequest,
route: &Route,
Expand All @@ -288,19 +288,21 @@ impl CloudFrontService {
let event_bytes = base64::engine::general_purpose::STANDARD
.decode(parsed.connection_object.trim().as_bytes())
.map_err(|e| invalid_argument(format!("ConnectionObject is not valid base64: {e}")))?;
let state = self.state.read();
let f = state
.accounts
.get(DEFAULT_ACCOUNT)
.and_then(|a| a.connection_functions.get(&name).cloned())
.ok_or_else(|| {
aws_error(
StatusCode::NOT_FOUND,
"EntityNotFound",
format!("ConnectionFunction {name} does not exist"),
)
})?;
drop(state);
// Scoped so the lock guard is gone before the await below.
let f = {
let state = self.state.read();
state
.accounts
.get(DEFAULT_ACCOUNT)
.and_then(|a| a.connection_functions.get(&name).cloned())
.ok_or_else(|| {
aws_error(
StatusCode::NOT_FOUND,
"EntityNotFound",
format!("ConnectionFunction {name} does not exist"),
)
})?
};
if f.etag != if_match {
return Err(precondition_failed());
}
Expand All @@ -317,7 +319,7 @@ impl CloudFrontService {
};
let code = std::str::from_utf8(source)
.map_err(|e| invalid_argument(format!("function code is not valid UTF-8: {e}")))?;
let exec = crate::js_runtime::run_handler(code, &event_bytes);
let exec = crate::js_runtime::run_handler_off_runtime(code.to_owned(), event_bytes).await;

let mut body = String::with_capacity(1024);
body.push_str(XML_DECL);
Expand Down
32 changes: 17 additions & 15 deletions crates/fakecloud-cloudfront/src/functions_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ impl CloudFrontService {
Ok(xml_with_etag(StatusCode::OK, body, &snap.etag, None))
}

pub(crate) fn test_function(
pub(crate) async fn test_function(
&self,
req: &AwsRequest,
route: &Route,
Expand All @@ -269,19 +269,21 @@ impl CloudFrontService {
.decode(parsed.event_object.trim().as_bytes())
.map_err(|e| invalid_argument(format!("EventObject is not valid base64: {e}")))?;

let state = self.state.read();
let f = state
.accounts
.get(DEFAULT_ACCOUNT)
.and_then(|a| a.functions.get(&name).cloned())
.ok_or_else(|| {
aws_error(
StatusCode::NOT_FOUND,
"NoSuchFunctionExists",
format!("The specified function does not exist: {name}"),
)
})?;
drop(state);
// Scoped so the lock guard is gone before the await below.
let f = {
let state = self.state.read();
state
.accounts
.get(DEFAULT_ACCOUNT)
.and_then(|a| a.functions.get(&name).cloned())
.ok_or_else(|| {
aws_error(
StatusCode::NOT_FOUND,
"NoSuchFunctionExists",
format!("The specified function does not exist: {name}"),
)
})?
};
if f.etag != if_match {
return Err(precondition_failed());
}
Expand All @@ -303,7 +305,7 @@ impl CloudFrontService {
.unwrap_or_else(|_| source_b64.as_bytes().to_vec());
let code = String::from_utf8(code_bytes)
.map_err(|e| invalid_argument(format!("function code is not valid UTF-8: {e}")))?;
let exec = crate::js_runtime::run_handler(&code, &event_bytes);
let exec = crate::js_runtime::run_handler_off_runtime(code, event_bytes).await;

let mut body = String::with_capacity(1024);
body.push_str(XML_DECL);
Expand Down
Loading
Loading