Page MenuHomePhorge
Files F33087458

D14888.1768458988.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D14888.1768458988.diff
View Options

diff --git a/services/identity/src/database/device_list.rs b/services/identity/src/database/device_list.rs
--- a/services/identity/src/database/device_list.rs
+++ b/services/identity/src/database/device_list.rs
@@ -1,19 +1,22 @@
-use std::collections::{HashMap, HashSet};
+use std::{
+ collections::{HashMap, HashSet},
+ sync::LazyLock,
+};
use chrono::{DateTime, Utc};
use comm_lib::{
aws::ddb::{
operation::{get_item::GetItemOutput, query::builders::QueryFluentBuilder},
types::{
- error::TransactionCanceledException, AttributeValue, Delete,
- DeleteRequest, Put, TransactWriteItem, Update, WriteRequest,
+ AttributeValue, Delete, DeleteRequest, Put, TransactWriteItem, Update,
+ WriteRequest,
},
},
backup::database::BackupItem,
database::{
- batch_operations::ExponentialBackoffConfig, AttributeExtractor,
- AttributeMap, DBItemAttributeError, DBItemError, DynamoDBError,
- TryFromAttribute,
+ batch_operations::ExponentialBackoffConfig, is_transaction_retryable,
+ AttributeExtractor, AttributeMap, DBItemAttributeError, DBItemError,
+ DynamoDBError, TryFromAttribute,
},
};
use serde::Serialize;
@@ -1744,6 +1747,15 @@
vec![put_device_list_operation, timestamp_update_operation];
operations.extend(update_info.ddb_operations);
+ use comm_lib::database::error_codes as err;
+ static CONCURRET_UPDATE_REASONS: LazyLock<HashSet<&str>> =
+ LazyLock::new(|| {
+ HashSet::from([
+ err::CONDITIONAL_CHECK_FAILED,
+ err::TRANSACTION_CONFLICT,
+ ])
+ });
+
self
.client
.transact_write_items()
@@ -1751,15 +1763,7 @@
.send()
.await
.map_err(|e| match DynamoDBError::from(e) {
- DynamoDBError::TransactionCanceledException(
- TransactionCanceledException {
- cancellation_reasons: Some(reasons),
- ..
- },
- ) if reasons
- .iter()
- .any(|reason| reason.code() == Some("ConditionalCheckFailed")) =>
- {
+ e if is_transaction_retryable(&e, &CONCURRET_UPDATE_REASONS) => {
Error::DeviceList(DeviceListError::ConcurrentUpdateError)
}
other => {

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 15, 6:36 AM (14 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5936535
Default Alt Text
D14888.1768458988.diff (2 KB)

Event Timeline