Page MenuHomePhabricator
Files F2863189

D13569.id.diff
No OneTemporary
Actions

D13569.id.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
@@ -10,8 +10,9 @@
},
},
database::{
- AttributeExtractor, AttributeMap, DBItemAttributeError, DBItemError,
- DynamoDBError, TryFromAttribute,
+ batch_operations::ExponentialBackoffConfig, AttributeExtractor,
+ AttributeMap, DBItemAttributeError, DBItemError, DynamoDBError,
+ TryFromAttribute,
},
};
use serde::Serialize;
@@ -24,6 +25,7 @@
error_types, USERS_TABLE, USERS_TABLE_DEVICELIST_TIMESTAMP_ATTRIBUTE_NAME,
USERS_TABLE_PARTITION_KEY,
},
+ ddb_utils::is_transaction_conflict,
error::{DeviceListError, Error},
grpc_services::{
protos::{self, unauth::DeviceType},
@@ -820,7 +822,8 @@
);
return Err(Error::InvalidFormat);
}
- self
+
+ let db_operation = self
.client
.update_item()
.table_name(devices_table::NAME)
@@ -837,18 +840,29 @@
.expression_attribute_names("#content_prekey", ATTR_CONTENT_PREKEY)
.expression_attribute_names("#notif_prekey", ATTR_NOTIF_PREKEY)
.expression_attribute_values(":content_prekey", content_prekey.into())
- .expression_attribute_values(":notif_prekey", notif_prekey.into())
- .send()
- .await
- .map_err(|e| {
- error!(
- errorType = error_types::DEVICE_LIST_DB_LOG,
- "Failed to update device prekeys: {:?}", e
- );
- Error::AwsSdk(e.into())
- })?;
-
- Ok(())
+ .expression_attribute_values(":notif_prekey", notif_prekey.into());
+
+ let retry_config = ExponentialBackoffConfig::default();
+ let mut exponential_backoff = retry_config.new_counter();
+ loop {
+ let result = db_operation.clone().send().await;
+
+ match result {
+ Ok(_) => return Ok(()),
+ Err(err) => match DynamoDBError::from(err) {
+ ref conflict_err if is_transaction_conflict(conflict_err) => {
+ exponential_backoff.sleep_and_retry().await?;
+ }
+ error => {
+ error!(
+ errorType = error_types::DEVICE_LIST_DB_LOG,
+ "Failed to update device prekeys: {:?}", error
+ );
+ return Err(error.into());
+ }
+ },
+ }
+ }
}
/// Checks if given device exists on user's current device list

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 3, 3:36 AM (13 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2220760
Default Alt Text
D13569.id.diff (2 KB)

Event Timeline