Skip to content

Split actor retry exhaustion outcomes and increase backoff #7414

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
apeacock1991 merged 2 commits into from
Sep 18, 2026
Merged

Split actor retry exhaustion outcomes and increase backoff #7414

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
c7b5cdb
Split actor retry exhaustion outcomes
apeacock1991 Sep 17, 2026
06f6bb3
Increase actor retry backoff
apeacock1991 Sep 17, 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
37 changes: 36 additions & 1 deletion src/workerd/api/actor-call-retry-test.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,42 @@ KJ_TEST("actor retries stop after five total attempts") {

KJ_ASSERT(observer->retryCallTypes.size() == 4);
KJ_ASSERT(observer->outcomes.size() == 1);
KJ_EXPECT(observer->outcomes[0] == ActorRetryOutcome::RETRIES_EXHAUSTED);
KJ_EXPECT(observer->outcomes[0] == ActorRetryOutcome::ATTEMPTS_EXHAUSTED);
}

KJ_TEST("actor retries report retry budget exhaustion when budget expires during an attempt") {
TestTimerChannel timer;
auto observer = kj::refcounted<RecordingObserver>();
auto state = newRetryState(timer, *observer);

startAttempt(*state);
KJ_EXPECT(handleFailure(*state, makeDisconnect("original disconnect"_kj)).is<kj::Duration>());
startAttempt(*state);
timer.advance(11 * kj::SECONDS);

auto result = handleFailure(*state, makeDisconnect("retry disconnect"_kj));
auto& failure = KJ_ASSERT_NONNULL(result.tryGet<kj::Exception>());
KJ_EXPECT(failure.getDescription().contains("original disconnect"));
KJ_ASSERT(observer->outcomes.size() == 1);
KJ_EXPECT(observer->outcomes[0] == ActorRetryOutcome::RETRY_BUDGET_EXHAUSTED);
}

KJ_TEST("actor retries report retry budget exhaustion when the next attempt cannot start") {
TestTimerChannel timer;
auto observer = kj::refcounted<RecordingObserver>();
auto state = newRetryState(timer, *observer);

startAttempt(*state);
KJ_EXPECT(handleFailure(*state, makeDisconnect("original disconnect"_kj)).is<kj::Duration>());
startAttempt(*state);
KJ_EXPECT(handleFailure(*state, makeDisconnect("retry disconnect"_kj)).is<kj::Duration>());
timer.advance(11 * kj::SECONDS);

auto result = state->startAttempt();
auto& failure = KJ_ASSERT_NONNULL(result.tryGet<kj::Exception>());
KJ_EXPECT(failure.getDescription().contains("original disconnect"));
KJ_ASSERT(observer->outcomes.size() == 1);
KJ_EXPECT(observer->outcomes[0] == ActorRetryOutcome::RETRY_BUDGET_EXHAUSTED);
}

KJ_TEST("actor retries return the original disconnect when the deadline expires before retry") {
Expand Down
6 changes: 3 additions & 3 deletions src/workerd/api/actor-call-retry.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ kj::OneOf<ActorCallRetryState::Attempt, kj::Exception> ActorCallRetryState::star
if (!isFirstAttempt.toBool()) {
KJ_IF_SOME(deadlineValue, deadline) {
if (timer.nowForLimitTimeout() >= deadlineValue) {
recordOutcome(ActorRetryOutcome::RETRIES_EXHAUSTED);
recordOutcome(ActorRetryOutcome::RETRY_BUDGET_EXHAUSTED);
return KJ_ASSERT_NONNULL(originalDisconnect).clone();
}
}
Expand Down Expand Up @@ -86,14 +86,14 @@ kj::OneOf<kj::Duration, kj::Exception> ActorCallRetryState::checkCanRetry(kj::Ex
return kj::mv(exception);
}
if (attemptCount >= MAX_ATTEMPTS) {
recordOutcome(ActorRetryOutcome::RETRIES_EXHAUSTED);
recordOutcome(ActorRetryOutcome::ATTEMPTS_EXHAUSTED);
return KJ_ASSERT_NONNULL(originalDisconnect).clone();
}

auto delay = retryDelay();
auto deadline = KJ_ASSERT_NONNULL(this->deadline);
if (timer.nowForLimitTimeout() + delay >= deadline) {
recordOutcome(ActorRetryOutcome::RETRIES_EXHAUSTED);
recordOutcome(ActorRetryOutcome::RETRY_BUDGET_EXHAUSTED);
KJ_IF_SOME(original, originalDisconnect) {
return original.clone();
}
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/actor-call-retry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class ActorCallRetryState final: public kj::Refcounted {
private:
static constexpr uint MAX_ATTEMPTS = 5;
static constexpr auto RETRY_BUDGET = 10 * kj::SECONDS;
static constexpr auto INITIAL_BACKOFF = 50 * kj::MILLISECONDS;
static constexpr auto INITIAL_BACKOFF = 500 * kj::MILLISECONDS;

kj::Maybe<kj::Exception> handleClaimRejection(const kj::Exception& exception);
kj::OneOf<kj::Duration, kj::Exception> checkCanRetry(kj::Exception exception);
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/actor-fetch-retry-test.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ KJ_TEST("actor fetch stops after five attempts") {
KJ_EXPECT(state.retryCount == 4);
KJ_EXPECT(state.observedRetryCount == 4);
KJ_ASSERT(state.outcomes.size() == 1);
KJ_EXPECT(state.outcomes[0] == ActorRetryOutcome::RETRIES_EXHAUSTED);
KJ_EXPECT(state.outcomes[0] == ActorRetryOutcome::ATTEMPTS_EXHAUSTED);
}

KJ_TEST("actor fetch allows an in-flight retry to finish after the start budget") {
Expand Down
3 changes: 2 additions & 1 deletion src/workerd/io/observer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ enum class ActorRetryCallType : uint8_t {

enum class ActorRetryOutcome : uint8_t {
RECOVERED,
RETRIES_EXHAUSTED,
ATTEMPTS_EXHAUSTED,
RETRY_BUDGET_EXHAUSTED,
UNABLE_TO_RETRY,
CLAIM_REJECTED,
CANCELED,
Expand Down
Loading