update to latest, small clean-ups

Author: tadjik1

src/index.ts

@@ -87,7 +87,6 @@ export {
   MongoWriteConcernError,
   WriteConcernErrorResult
 } from './error';
-export { TokenBucket } from './token_bucket';
 export {
   AbstractCursor,
   // Actual driver classes exported

src/operations/execute_operation.ts

@@ -251,11 +251,6 @@ async function executeOperationWithRetries<
           : 2
         : 1;
 
-  const shouldRetry =
-    (operation.hasAspect(Aspect.READ_OPERATION) && topology.s.options.retryReads) ||
-    ((operation.hasAspect(Aspect.WRITE_OPERATION) || operation instanceof RunCommandOperation) &&
-      topology.s.options.retryWrites);
-
   let error: MongoError | null = null;
 
   for (let attempt = 0; attempt < maxAttempts; attempt++) {

src/operations/operation.ts

@@ -66,7 +66,7 @@ export abstract class AbstractOperation<TResult = any> {
   /** Specifies the time an operation will run until it throws a timeout error. */
   timeoutMS?: number;
 
-  /** @internal Used by commitTransaction to share the retry budget across two executeOperatin calls. */
+  /** @internal Used by commitTransaction to share the retry budget across two executeOperation calls. */
   maxAttempts?: number;
 
   /** @internal Tracks how many attempts were made in the last executeOperation call. */

src/sdam/topology.ts

@@ -35,7 +35,7 @@ import { type Abortable, TypedEventEmitter } from '../mongo_types';
 import { ReadPreference, type ReadPreferenceLike } from '../read_preference';
 import type { ClientSession } from '../sessions';
 import { Timeout, TimeoutContext, TimeoutError } from '../timeout';
-import { TokenBucket } from '../token_bucket';
+import { INITIAL_TOKEN_BUCKET_SIZE, TokenBucket } from '../token_bucket';
 import type { Transaction } from '../transactions';
 import {
   addAbortListener,
@@ -213,7 +213,7 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
   hello?: Document;
   _type?: string;
 
-  tokenBucket = new TokenBucket(1000);
+  tokenBucket = new TokenBucket(INITIAL_TOKEN_BUCKET_SIZE);
 
   client!: MongoClient;
 

src/sessions.ts

@@ -1254,9 +1254,9 @@ export function updateSessionFromResponse(session: ClientSession, document: Mong
       session.transaction.transition(TxnState.TRANSACTION_IN_PROGRESS);
     } else {
       const error = new MongoServerError(document.toObject());
-      const isBackpressureError = error.hasErrorLabel(MongoErrorLabel.RetryableError);
+      const isRetryableError = error.hasErrorLabel(MongoErrorLabel.RetryableError);
 
-      if (!isBackpressureError) {
+      if (!isRetryableError) {
         session.transaction.transition(TxnState.TRANSACTION_IN_PROGRESS);
       }
     }

sync.sh

@@ -1,4 +1,4 @@
 
 
-cp ~/dev/specifications/source/client-backpressure/tests/* ~/dev/node-mongodb-native/test/spec/client-backpressure
-cp ~/dev/specifications/source/transactions/tests/unified/backpressure* ~/dev/node-mongodb-native/test/spec/transactions/unified/
+cp ~/code/specifications/source/client-backpressure/tests/* ~/code/node-mongodb-native/test/spec/client-backpressure
+cp ~/code/specifications/source/transactions/tests/unified/backpressure* ~/code/node-mongodb-native/test/spec/transactions/unified/

test/integration/client-backpressure/client-backpressure.prose.test.ts

@@ -16,6 +16,7 @@ describe('Client Backpressure (Prose)', function () {
   });
 
   afterEach(async function () {
+    sinon.restore();
     await client.close();
     await clearFailPoint(this.configuration);
   });

test/integration/mongodb-handshake/mongodb-handshake.prose.test.ts

@@ -5,8 +5,10 @@ import * as sinon from 'sinon';
 import {
   type ClientMetadata,
   Connection,
+  type Document,
   type DriverInfo,
   getFAASEnv,
+  type HandshakeDocument,
   Int32,
   isDriverInfoEqual,
   LEGACY_HELLO_COMMAND,

test/spec/client-backpressure/README.md

@@ -50,8 +50,21 @@ Drivers should test that retries do not occur immediately when a SystemOverloade
     5. Execute step 3 again.
 
     6. Compare the two time between the two runs.
+
         ```python
         assertTrue(with_backoff_time - no_backoff_time >= 2.1)
         ```
+
         The sum of 5 backoffs is 3.1 seconds. There is a 1-second window to account for potential variance between the two
         runs.
+
+#### Test 2: Token Bucket Capacity is Enforced
+
+Drivers should test that retry token buckets are created at their maximum capacity and that that capacity is enforced.
+
+1. Let `client` be a `MongoClient`.
+2. Assert that the client's retry token bucket is at full capacity and that the capacity is
+    `DEFAULT_RETRY_TOKEN_CAPACITY`.
+3. Using `client`, execute a successful `ping` command.
+4. Assert that the successful command did not increase the number of tokens in the bucket above
+    `DEFAULT_RETRY_TOKEN_CAPACITY`.