remove stray only

clear up logic lint fix clean up lint fix 2
mongodb · Jul 9, 2024 · ad5b150 · ad5b150
1 parent 440bac7
commit ad5b150
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/cmap/connect.ts b/src/cmap/connect.ts
@@ -31,7 +31,6 @@ import {
   MIN_SUPPORTED_SERVER_VERSION,
   MIN_SUPPORTED_WIRE_VERSION
 } from './wire_protocol/constants';
-import { isSharded } from './wire_protocol/shared';
 
 /** @public */
 export type Stream = Socket | TLSSocket;
@@ -165,7 +164,7 @@ export async function performInitialHandshake(
     } catch (error) {
       if (error instanceof MongoError) {
         error.addErrorLabel(MongoErrorLabel.HandshakeError);
-        if (needsRetryableWriteLabel(error, response.maxWireVersion, isSharded(conn))) {
+        if (needsRetryableWriteLabel(error, response.maxWireVersion, conn.description.type)) {
           error.addErrorLabel(MongoErrorLabel.RetryableWriteError);
         }
       }

diff --git a/src/error.ts b/src/error.ts
@@ -1,4 +1,5 @@
 import type { Document } from './bson';
+import type { ServerType } from './sdam/common';
 import type { TopologyVersion } from './sdam/server_description';
 import type { TopologyDescription } from './sdam/topology_description';
 
@@ -1220,7 +1221,7 @@ const RETRYABLE_WRITE_ERROR_CODES = RETRYABLE_READ_ERROR_CODES;
 export function needsRetryableWriteLabel(
   error: Error,
   maxWireVersion: number,
-  isSharded: boolean
+  serverType: ServerType
 ): boolean {
   // pre-4.4 server, then the driver adds an error label for every valid case
   // execute operation will only inspect the label, code/message logic is handled here
@@ -1241,13 +1242,13 @@ export function needsRetryableWriteLabel(
   }
 
   if (error instanceof MongoWriteConcernError) {
-    return isSharded && maxWireVersion < 9
+    return serverType === 'Mongos' && maxWireVersion < 9
       ? false
-      : RETRYABLE_WRITE_ERROR_CODES.has(error.result?.code ?? error.code ?? 0);
+      : RETRYABLE_WRITE_ERROR_CODES.has(error.result?.code ?? Number(error.code) ?? 0);
   }
 
   if (error instanceof MongoError && typeof error.code === 'number') {
-    return RETRYABLE_WRITE_ERROR_CODES.has(error.code);
+    return RETRYABLE_WRITE_ERROR_CODES.has(Number(error.code));
   }
 
   const isNotWritablePrimaryError = LEGACY_NOT_WRITABLE_PRIMARY_ERROR_MESSAGE.test(error.message);

diff --git a/src/sdam/server.ts b/src/sdam/server.ts
@@ -8,7 +8,6 @@ import {
 } from '../cmap/connection_pool';
 import { PoolClearedError } from '../cmap/errors';
 import { type MongoDBResponseConstructor } from '../cmap/wire_protocol/responses';
-import { isSharded } from '../cmap/wire_protocol/shared';
 import {
   APM_EVENTS,
   CLOSED,
@@ -454,7 +453,7 @@ export class Server extends TypedEventEmitter<ServerEvents> {
     } else {
       if (
         (isRetryableWritesEnabled(this.topology) || isTransactionCommand(cmd)) &&
-        needsRetryableWriteLabel(error, maxWireVersion(this), isSharded(this)) &&
+        needsRetryableWriteLabel(error, maxWireVersion(this), this.description.type) &&
         !inActiveTransaction(session, cmd)
       ) {
         error.addErrorLabel(MongoErrorLabel.RetryableWriteError);

diff --git a/test/integration/retryable-writes/retryable_writes.spec.test.ts b/test/integration/retryable-writes/retryable_writes.spec.test.ts
@@ -15,7 +15,7 @@ interface RetryableWriteTestContext {
   failPointName?: any;
 }
 
-describe.only('Legacy Retryable Writes Specs', function () {
+describe('Legacy Retryable Writes Specs', function () {
   let ctx: RetryableWriteTestContext = {};
 
   const retryableWrites = loadSpecTests('retryable-writes', 'legacy');
@@ -229,6 +229,6 @@ async function turnOffFailPoint(client, name) {
   });
 }
 
-describe.only('Retryable Writes (unified)', function () {
+describe('Retryable Writes (unified)', function () {
   runUnifiedSuite(loadSpecTests(path.join('retryable-writes', 'unified')));
 });