fix: Make transaction rollback best effort. (#1967)

* Make rollback best effort. * Fix test
googleapis · Jan 5, 2024 · 1d76546 · 1d76546
1 parent d9c867f
commit 1d76546
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/dev/src/transaction.ts b/dev/src/transaction.ts
@@ -481,7 +481,20 @@ export class Transaction implements firestore.Transaction {
       transaction: this._transactionId,
     };
 
-    return this._firestore.request('rollback', request, this._requestTag);
+    const promise: Promise<void> = this._firestore.request(
+      'rollback',
+      request,
+      this._requestTag
+    );
+
+    return promise.catch(reason => {
+      logger(
+        'Firestore.runTransaction',
+        this._requestTag,
+        'Best effort to rollback failed with error:',
+        reason
+      );
+    });
   }
 
   /**

diff --git a/dev/test/transaction.ts b/dev/test/transaction.ts
@@ -574,7 +574,6 @@ describe('failed transactions', () => {
           begin({transactionId: 'foo1'}),
           commit('foo1', /* writes=*/ undefined, serverError),
           rollback('foo1', serverError),
-          rollback('foo1'),
           backoff(),
           begin({
             transactionId: 'foo2',