fix: unpin on first execution of cursor creating command

src/operations/aggregate.ts

@@ -79,6 +79,10 @@ export class AggregateOperation<T = Document> extends CommandOperation<T> {
     }
   }
 
+  get isCursorCreating(): boolean {
+    return true;
+  }
+
   get canRetryRead(): boolean {
     return !this.hasWriteStage;
   }

src/operations/execute_operation.ts

@@ -4,6 +4,7 @@ import {
   isRetryableError,
   MONGODB_ERROR_CODES,
   MongoDriverError,
+  MongoNetworkError,
   MongoCompatibilityError,
   MongoServerError
 } from '../error';
@@ -181,16 +182,31 @@ function executeWithServerSelection(
     }
 
     // select a new server, and attempt to retry the operation
-    topology.selectServer(readPreference, serverSelectionOptions, (err?: any, server?: any) => {
+    topology.selectServer(readPreference, serverSelectionOptions, (e?: any, server?: any) => {
       if (
-        err ||
+        e ||
         (operation.hasAspect(Aspect.READ_OPERATION) && !supportsRetryableReads(server)) ||
         (operation.hasAspect(Aspect.WRITE_OPERATION) && !supportsRetryableWrites(server))
       ) {
-        callback(err);
+        callback(e);
         return;
       }
 
+      // If we have a cursor and the initial command fails with a network error,
+      // we can retry it on another connection. So we need to check it back in, clear the
+      // pool for the service id, and retry again.
+      if (
+        err &&
+        err instanceof MongoNetworkError &&
+        server.loadBalanced &&
+        session &&
+        session.isPinned &&
+        !session.inTransaction() &&
+        operation.isCursorCreating
+      ) {
+        session.unpin({ force: true, forceClear: true });
+      }
+
       operation.execute(server, session, callback);
     });
   }

src/operations/find.ts

@@ -101,6 +101,10 @@ export class FindOperation extends CommandOperation<Document> {
     this.filter = filter != null && filter._bsontype === 'ObjectID' ? { _id: filter } : filter;
   }
 
+  get isCursorCreating(): boolean {
+    return true;
+  }
+
   execute(server: Server, session: ClientSession, callback: Callback<Document>): void {
     this.server = server;
 

src/operations/indexes.ts

@@ -169,6 +169,10 @@ export class IndexesOperation extends AbstractOperation<Document> {
     this.collection = collection;
   }
 
+  get isCursorCreating(): boolean {
+    return true;
+  }
+
   execute(server: Server, session: ClientSession, callback: Callback<Document>): void {
     const coll = this.collection;
     const options = this.options;

src/operations/list_collections.ts

@@ -40,6 +40,10 @@ export class ListCollectionsOperation extends CommandOperation<string[]> {
     }
   }
 
+  get isCursorCreating(): boolean {
+    return true;
+  }
+
   execute(server: Server, session: ClientSession, callback: Callback<string[]>): void {
     if (maxWireVersion(server) < LIST_COLLECTIONS_WIRE_VERSION) {
       let filter = this.filter;

src/operations/operation.ts

@@ -89,6 +89,10 @@ export abstract class AbstractOperation<TResult = any> {
     return this[kSession];
   }
 
+  get isCursorCreating(): boolean {
+    return false;
+  }
+
   get canRetryRead(): boolean {
     return true;
   }

src/sessions.ts

@@ -95,6 +95,7 @@ export interface EndSessionOptions {
    */
   error?: AnyError;
   force?: boolean;
+  forceClear?: boolean;
 }
 
 /**
@@ -225,7 +226,7 @@ export class ClientSession extends TypedEventEmitter<ClientSessionEvents> {
   }
 
   /** @internal */
-  unpin(options?: { force?: boolean; error?: AnyError }): void {
+  unpin(options?: { force?: boolean; forceClear?: boolean; error?: AnyError }): void {
     if (this.loadBalanced) {
       return maybeClearPinnedConnection(this, options);
     }
@@ -479,16 +480,23 @@ export function maybeClearPinnedConnection(
 
   // NOTE: the spec talks about what to do on a network error only, but the tests seem to
   //       to validate that we don't unpin on _all_ errors?
-  if (conn && (options?.error == null || options?.force)) {
+  if (conn) {
     const servers = Array.from(session.topology.s.servers.values());
     const loadBalancer = servers[0];
-    loadBalancer.s.pool.checkIn(conn);
-    conn.emit(
-      Connection.UNPINNED,
-      session.transaction.state !== TxnState.NO_TRANSACTION
-        ? ConnectionPoolMetrics.TXN
-        : ConnectionPoolMetrics.CURSOR
-    );
+
+    if (options?.error == null || options?.force) {
+      loadBalancer.s.pool.checkIn(conn);
+      conn.emit(
+        Connection.UNPINNED,
+        session.transaction.state !== TxnState.NO_TRANSACTION
+          ? ConnectionPoolMetrics.TXN
+          : ConnectionPoolMetrics.CURSOR
+      );
+
+      if (options?.forceClear) {
+        loadBalancer.s.pool.clear(conn.serviceId);
+      }
+    }
 
     session[kPinnedConnection] = undefined;
   }