Revert "PYTHON-5506 Prototype adaptive token bucket retry (#2501)"

This reverts commit 1820f97.

Author: sleepyStick

test/asynchronous/test_backpressure.py

@@ -182,72 +182,6 @@ async def test_limit_retry_command(self):
         self.assertIn("RetryableError", str(error.exception))
 
 
-class TestRetryPolicy(AsyncPyMongoTestCase):
-    async def test_retry_policy(self):
-        capacity = 10
-        retry_policy = _RetryPolicy(_TokenBucket(capacity=capacity))
-        self.assertEqual(retry_policy.attempts, helpers._MAX_RETRIES)
-        self.assertEqual(retry_policy.backoff_initial, helpers._BACKOFF_INITIAL)
-        self.assertEqual(retry_policy.backoff_max, helpers._BACKOFF_MAX)
-        for i in range(1, helpers._MAX_RETRIES + 1):
-            self.assertTrue(await retry_policy.should_retry(i, 0))
-        self.assertFalse(await retry_policy.should_retry(helpers._MAX_RETRIES + 1, 0))
-        for i in range(capacity - helpers._MAX_RETRIES):
-            self.assertTrue(await retry_policy.should_retry(1, 0))
-        # No tokens left, should not retry.
-        self.assertFalse(await retry_policy.should_retry(1, 0))
-        self.assertEqual(retry_policy.token_bucket.tokens, 0)
-
-        # record_success should generate tokens.
-        for _ in range(int(2 / helpers.DEFAULT_RETRY_TOKEN_RETURN)):
-            await retry_policy.record_success(retry=False)
-        self.assertAlmostEqual(retry_policy.token_bucket.tokens, 2)
-        for i in range(2):
-            self.assertTrue(await retry_policy.should_retry(1, 0))
-        self.assertFalse(await retry_policy.should_retry(1, 0))
-
-        # Recording a successful retry should return 1 additional token.
-        await retry_policy.record_success(retry=True)
-        self.assertAlmostEqual(
-            retry_policy.token_bucket.tokens, 1 + helpers.DEFAULT_RETRY_TOKEN_RETURN
-        )
-        self.assertTrue(await retry_policy.should_retry(1, 0))
-        self.assertFalse(await retry_policy.should_retry(1, 0))
-        self.assertAlmostEqual(retry_policy.token_bucket.tokens, helpers.DEFAULT_RETRY_TOKEN_RETURN)
-
-    async def test_retry_policy_csot(self):
-        retry_policy = _RetryPolicy(_TokenBucket())
-        self.assertTrue(await retry_policy.should_retry(1, 0.5))
-        with pymongo.timeout(0.5):
-            self.assertTrue(await retry_policy.should_retry(1, 0))
-            self.assertTrue(await retry_policy.should_retry(1, 0.1))
-            # Would exceed the timeout, should not retry.
-            self.assertFalse(await retry_policy.should_retry(1, 1.0))
-        self.assertTrue(await retry_policy.should_retry(1, 1.0))
-
-    @async_client_context.require_failCommand_appName
-    async def test_limit_retry_command(self):
-        client = await self.async_rs_or_single_client()
-        client._retry_policy.token_bucket.tokens = 1
-        db = client.pymongo_test
-        await db.t.insert_one({"x": 1})
-
-        # Ensure command is retried once overload error.
-        fail_many = mock_overload_error.copy()
-        fail_many["mode"] = {"times": 1}
-        async with self.fail_point(fail_many):
-            await db.command("find", "t")
-
-        # Ensure command stops retrying when there are no tokens left.
-        fail_too_many = mock_overload_error.copy()
-        fail_too_many["mode"] = {"times": 2}
-        async with self.fail_point(fail_too_many):
-            with self.assertRaises(PyMongoError) as error:
-                await db.command("find", "t")
-
-        self.assertIn("Retryable", str(error.exception))
-
-
 class TestRetryPolicy(AsyncPyMongoTestCase):
     async def test_retry_policy(self):
         capacity = 10

test/test_backpressure.py

@@ -182,72 +182,6 @@ def test_limit_retry_command(self):
         self.assertIn("RetryableError", str(error.exception))
 
 
-class TestRetryPolicy(PyMongoTestCase):
-    def test_retry_policy(self):
-        capacity = 10
-        retry_policy = _RetryPolicy(_TokenBucket(capacity=capacity))
-        self.assertEqual(retry_policy.attempts, helpers._MAX_RETRIES)
-        self.assertEqual(retry_policy.backoff_initial, helpers._BACKOFF_INITIAL)
-        self.assertEqual(retry_policy.backoff_max, helpers._BACKOFF_MAX)
-        for i in range(1, helpers._MAX_RETRIES + 1):
-            self.assertTrue(retry_policy.should_retry(i, 0))
-        self.assertFalse(retry_policy.should_retry(helpers._MAX_RETRIES + 1, 0))
-        for i in range(capacity - helpers._MAX_RETRIES):
-            self.assertTrue(retry_policy.should_retry(1, 0))
-        # No tokens left, should not retry.
-        self.assertFalse(retry_policy.should_retry(1, 0))
-        self.assertEqual(retry_policy.token_bucket.tokens, 0)
-
-        # record_success should generate tokens.
-        for _ in range(int(2 / helpers.DEFAULT_RETRY_TOKEN_RETURN)):
-            retry_policy.record_success(retry=False)
-        self.assertAlmostEqual(retry_policy.token_bucket.tokens, 2)
-        for i in range(2):
-            self.assertTrue(retry_policy.should_retry(1, 0))
-        self.assertFalse(retry_policy.should_retry(1, 0))
-
-        # Recording a successful retry should return 1 additional token.
-        retry_policy.record_success(retry=True)
-        self.assertAlmostEqual(
-            retry_policy.token_bucket.tokens, 1 + helpers.DEFAULT_RETRY_TOKEN_RETURN
-        )
-        self.assertTrue(retry_policy.should_retry(1, 0))
-        self.assertFalse(retry_policy.should_retry(1, 0))
-        self.assertAlmostEqual(retry_policy.token_bucket.tokens, helpers.DEFAULT_RETRY_TOKEN_RETURN)
-
-    def test_retry_policy_csot(self):
-        retry_policy = _RetryPolicy(_TokenBucket())
-        self.assertTrue(retry_policy.should_retry(1, 0.5))
-        with pymongo.timeout(0.5):
-            self.assertTrue(retry_policy.should_retry(1, 0))
-            self.assertTrue(retry_policy.should_retry(1, 0.1))
-            # Would exceed the timeout, should not retry.
-            self.assertFalse(retry_policy.should_retry(1, 1.0))
-        self.assertTrue(retry_policy.should_retry(1, 1.0))
-
-    @client_context.require_failCommand_appName
-    def test_limit_retry_command(self):
-        client = self.rs_or_single_client()
-        client._retry_policy.token_bucket.tokens = 1
-        db = client.pymongo_test
-        db.t.insert_one({"x": 1})
-
-        # Ensure command is retried once overload error.
-        fail_many = mock_overload_error.copy()
-        fail_many["mode"] = {"times": 1}
-        with self.fail_point(fail_many):
-            db.command("find", "t")
-
-        # Ensure command stops retrying when there are no tokens left.
-        fail_too_many = mock_overload_error.copy()
-        fail_too_many["mode"] = {"times": 2}
-        with self.fail_point(fail_too_many):
-            with self.assertRaises(PyMongoError) as error:
-                db.command("find", "t")
-
-        self.assertIn("Retryable", str(error.exception))
-
-
 class TestRetryPolicy(PyMongoTestCase):
     def test_retry_policy(self):
         capacity = 10