From f3b9a8d97fc10fdd3f8876c35dd679841115f5e3 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 3 Sep 2021 14:15:22 -0700
Subject: [PATCH] Add account to migration retry table on transient dynamo
 failure

---
 .../storage/AccountsDynamoDb.java             | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsDynamoDb.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsDynamoDb.java
index abc8d790f..6f5e00fc7 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsDynamoDb.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsDynamoDb.java
@@ -215,18 +215,25 @@ public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountSt
       }
 
       try {
-        UpdateItemResponse response = client.updateItem(updateItemRequest);
+        try {
+          UpdateItemResponse response = client.updateItem(updateItemRequest);
 
-        account.setVersion(AttributeValues.getInt(response.attributes(), "V", account.getVersion() + 1));
-      } catch (final TransactionConflictException e) {
+          account.setVersion(AttributeValues.getInt(response.attributes(), "V", account.getVersion() + 1));
+        } catch (final TransactionConflictException e) {
 
-        throw new ContestedOptimisticLockException();
+          throw new ContestedOptimisticLockException();
 
-      } catch (final ConditionalCheckFailedException e) {
+        } catch (final ConditionalCheckFailedException e) {
 
-        // the exception doesn’t give details about which condition failed,
-        // but we can infer it was an optimistic locking failure if the UUID is known
-        throw get(account.getUuid()).isPresent() ? new ContestedOptimisticLockException() : e;
+          // the exception doesn’t give details about which condition failed,
+          // but we can infer it was an optimistic locking failure if the UUID is known
+          throw get(account.getUuid()).isPresent() ? new ContestedOptimisticLockException() : e;
+        }
+      } catch (final Exception e) {
+        // the Dynamo account now lags the Postgres account version. Put it in the migration retry table so that it will
+        // get updated faster—otherwise it will be stale until the accounts crawler runs again
+        migrationRetryAccounts.put(account.getUuid());
+        throw e;
       }
 
     });