Skip to content

fix(kms-connector): poll KMS response if request already exists #856

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
eudelins-zama merged 1 commit into from
Sep 24, 2025
Merged

fix(kms-connector): poll KMS response if request already exists #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 9 additions & 11 deletions kms-connector/crates/kms-worker/src/core/event_processor/kms_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,24 +242,22 @@ where
Fut: Future<Output = Result<Response<Empty>, Status>>,
{
for i in 1..=retries {
match request_fn()
.await
.map_err(ProcessingError::from_request_status)
{
match request_fn().await {
Ok(_) => break,
Err(ProcessingError::Irrecoverable(e)) => {
Err(e) if e.code() == Code::AlreadyExists => return Ok(()),
Err(e) if [Code::ResourceExhausted, Code::Unknown].contains(&e.code()) => {
CORE_REQUEST_SENT_ERRORS.inc();
return Err(ProcessingError::Irrecoverable(e));
}
Err(ProcessingError::Recoverable(e)) => {
CORE_REQUEST_SENT_ERRORS.inc();
warn!("#{}/{} GRPC request attempt failed: {}", i, retries, e);
warn!("#{i}/{retries} GRPC request attempt failed: {e}");
if i == retries {
return Err(ProcessingError::Recoverable(anyhow!(
"All GRPC requests failed!"
)));
}
}
Err(e) => {
CORE_REQUEST_SENT_ERRORS.inc();
return Err(ProcessingError::Irrecoverable(e.into()));
}
}
}
CORE_REQUEST_SENT_COUNTER.inc();
Expand Down Expand Up @@ -287,7 +285,7 @@ where
return Ok(response);
}
Err(status) => {
if status.code() == Code::Unavailable {
if [Code::Unavailable, Code::Unknown].contains(&status.code()) {
// Check if we've exceeded the timeout
if start.elapsed() >= timeout {
CORE_RESPONSE_ERRORS.inc();
Expand Down
11 changes: 1 addition & 10 deletions kms-connector/crates/kms-worker/src/core/event_processor/processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,20 +121,11 @@ impl<P: Provider> DbEventProcessor<P> {
}

impl ProcessingError {
/// Converts GRPC status of a request sent to the KMS into a `ProcessingError`.
pub fn from_request_status(value: tonic::Status) -> Self {
let anyhow_error = anyhow!("KMS GRPC error: {value}");
match value.code() {
Code::ResourceExhausted => Self::Recoverable(anyhow_error),
_ => Self::Irrecoverable(anyhow_error),
}
}

/// Converts GRPC status of the polling of a KMS Response into a `ProcessingError`.
pub fn from_response_status(value: tonic::Status) -> Self {
let anyhow_error = anyhow!("KMS GRPC error: {value}");
match value.code() {
Code::NotFound | Code::Unavailable | Code::ResourceExhausted => {
Code::DeadlineExceeded | Code::Unavailable | Code::ResourceExhausted => {
Self::Recoverable(anyhow_error)
}
_ => Self::Irrecoverable(anyhow_error),
Expand Down