fix: "willRetryWrites"

mongodb · Mar 12, 2022 · a3dc79f · a3dc79f
1 parent ea3b615
commit a3dc79f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/cmap/connection.ts b/src/cmap/connection.ts
@@ -110,7 +110,7 @@ export interface CommandOptions extends BSONSerializeOptions {
   omitReadPreference?: boolean;
 
   // FIXME: NODE-2802
-  willRetryWrite?: boolean;
+  willRetryWrites?: boolean;
 
   // FIXME: NODE-2781
   writeConcern?: WriteConcernOptions | WriteConcern | W;

diff --git a/src/operations/execute_operation.ts b/src/operations/execute_operation.ts
@@ -259,7 +259,7 @@ function executeWithServerSelection(
         supportsRetryableReads(server) &&
         operation.canRetryRead;
 
-      const willRetryWrite =
+      const willRetryWrites =
         topology.s.options.retryWrites === true &&
         !inTransaction &&
         supportsRetryableWrites(server) &&
@@ -268,9 +268,9 @@ function executeWithServerSelection(
       const hasReadAspect = operation.hasAspect(Aspect.READ_OPERATION);
       const hasWriteAspect = operation.hasAspect(Aspect.WRITE_OPERATION);
 
-      if ((hasReadAspect && willRetryRead) || (hasWriteAspect && willRetryWrite)) {
-        if (hasWriteAspect && willRetryWrite) {
-          operation.options.willRetryWrite = true;
+      if ((hasReadAspect && willRetryRead) || (hasWriteAspect && willRetryWrites)) {
+        if (hasWriteAspect && willRetryWrites) {
+          operation.options.willRetryWrites = true;
           session.incrementTransactionNumber();
         }
 

diff --git a/src/operations/operation.ts b/src/operations/operation.ts
@@ -57,7 +57,7 @@ export abstract class AbstractOperation<TResult = any> {
   bsonOptions?: BSONSerializeOptions;
 
   // TODO: Each operation defines its own options, there should be better typing here
-  options: Document;
+  options: OperationOptions;
 
   [kSession]: ClientSession;
 

diff --git a/src/sessions.ts b/src/sessions.ts
@@ -937,7 +937,7 @@ export class ServerSessionPool {
 export function applySession(
   session: ClientSession,
   command: Document,
-  options?: CommandOptions
+  options: CommandOptions
 ): MongoDriverError | undefined {
   // TODO: merge this with `assertAlive`, did not want to throw a try/catch here
   if (session.hasEnded) {
@@ -963,10 +963,10 @@ export function applySession(
   command.lsid = serverSession.id;
 
   // first apply non-transaction-specific sessions data
-  const inTransaction = session.inTransaction() || isTransactionCommand(command);
-  const isRetryableWrite = options?.willRetryWrite || false;
+  const inTransaction = session.inTransaction() ?? isTransactionCommand(command);
+  const isRetryableWrite = options.willRetryWrites ?? false;
 
-  if (serverSession.txnNumber && (isRetryableWrite || inTransaction)) {
+  if (isRetryableWrite || inTransaction) {
     command.txnNumber = Long.fromNumber(serverSession.txnNumber);
   }