Commit 504e837
committed
fix(rate-limiter): bound Redis connection acquisition with a 2s timeout
Without a time-bound on ``Client::get_multiplexed_tokio_connection().await``,
the rate-limiter blocks indefinitely against any Redis endpoint where the
TCP handshake completes but the application layer never speaks
(e.g. plain ``redis://`` against a TLS-required server, network ACL drops,
firewalled cluster, etc.). Every request through the plugin then pays
the framework's outer 30-second plugin timeout, and ``fail_mode`` cannot
engage because the connection-acquisition future never returns to surface
an error.
This commit wraps the connection acquisition in
``tokio::time::timeout(Duration::from_secs(2), …)`` and maps the elapsed
error into a ``redis::ErrorKind::IoError``-shaped ``RedisError`` so the
existing ``fail_mode`` path routes it the same way as any other
connection-side failure.
Test coverage added at both layers:
* Rust unit test (``redis_backend::tests::connection_async_fails_fast_against_hanging_redis``)
— binds a TCP listener that accepts but never reads/writes; asserts
``connection_async`` returns within ~3s with an ``IoError``-shaped
error.
* Python integration test
(``TestRedisFailModeAndViolationContext::test_hanging_redis_fails_fast_via_connect_timeout``)
— same setup pattern at the public-API layer; asserts
``tool_pre_invoke`` completes within ~5s and the default
``fail_mode=open`` allows the request through.
Both tests fail-by-hang against the prior implementation and pass against
this commit; an outer ``tokio::time::timeout`` / ``asyncio.wait_for``
guards each so a regression doesn't hang the test run.
The 2-second value is hardcoded as ``CONNECT_TIMEOUT`` for now to keep
the change small. Promoting it to a ``redis_connect_timeout_ms`` config
key (extending the existing config-key list and warning machinery) is a
trivial follow-up if operators in slow-network deployments need a longer
budget.
Signed-off-by: Pratik Gandhi <gandhipratik203@gmail.com>1 parent a028dae commit 504e837
2 files changed
Lines changed: 165 additions & 1 deletion
File tree
- plugins
- rust/python-package/rate_limiter/src
- tests/rate_limiter
Lines changed: 105 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
22 | 23 | | |
| 24 | + | |
23 | 25 | | |
24 | 26 | | |
25 | 27 | | |
| |||
219 | 221 | | |
220 | 222 | | |
221 | 223 | | |
222 | | - | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
223 | 249 | | |
224 | 250 | | |
225 | 251 | | |
| |||
542 | 568 | | |
543 | 569 | | |
544 | 570 | | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
545 | 649 | | |
546 | 650 | | |
547 | 651 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1540 | 1540 | | |
1541 | 1541 | | |
1542 | 1542 | | |
| 1543 | + | |
| 1544 | + | |
| 1545 | + | |
| 1546 | + | |
| 1547 | + | |
| 1548 | + | |
| 1549 | + | |
| 1550 | + | |
| 1551 | + | |
| 1552 | + | |
| 1553 | + | |
| 1554 | + | |
| 1555 | + | |
| 1556 | + | |
| 1557 | + | |
| 1558 | + | |
| 1559 | + | |
| 1560 | + | |
| 1561 | + | |
| 1562 | + | |
| 1563 | + | |
| 1564 | + | |
| 1565 | + | |
| 1566 | + | |
| 1567 | + | |
| 1568 | + | |
| 1569 | + | |
| 1570 | + | |
| 1571 | + | |
| 1572 | + | |
| 1573 | + | |
| 1574 | + | |
| 1575 | + | |
| 1576 | + | |
| 1577 | + | |
| 1578 | + | |
| 1579 | + | |
| 1580 | + | |
| 1581 | + | |
| 1582 | + | |
| 1583 | + | |
| 1584 | + | |
| 1585 | + | |
| 1586 | + | |
| 1587 | + | |
| 1588 | + | |
| 1589 | + | |
| 1590 | + | |
| 1591 | + | |
| 1592 | + | |
| 1593 | + | |
| 1594 | + | |
| 1595 | + | |
| 1596 | + | |
| 1597 | + | |
| 1598 | + | |
| 1599 | + | |
| 1600 | + | |
| 1601 | + | |
| 1602 | + | |
1543 | 1603 | | |
1544 | 1604 | | |
1545 | 1605 | | |
| |||
0 commit comments