Skip to content

Commit 07402d0

Browse files
authored
Merge branch 'feat/hitless-upgrade-sync-standalone' into ps_add_fail_over_events_handling
2 parents 10ded34 + 4518ce8 commit 07402d0

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

redis/maintenance_events.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class MaintenanceState(enum.Enum):
1515
FAILING_OVER = "failing_over"
1616

1717

18+
1819
if TYPE_CHECKING:
1920
from redis.connection import (
2021
BlockingConnectionPool,
@@ -581,11 +582,13 @@ def handle_maintenance_start_event(self, maintenance_state: MaintenanceState):
581582
or not self.config.is_relax_timeouts_enabled()
582583
):
583584
return
585+
584586
self.connection.maintenance_state = maintenance_state
585587
self.connection.set_tmp_settings(tmp_relax_timeout=self.config.relax_timeout)
586588
# extend the timeout for all created connections
587589
self.connection.update_current_socket_timeout(self.config.relax_timeout)
588590

591+
589592
def handle_maintenance_completed_event(self):
590593
# Only reset timeouts if state is not MOVING and relax timeouts are enabled
591594
if (

tests/test_maintenance_events.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ def test_equality_and_hash(self):
283283
assert hash(event1) == hash(event2)
284284
assert hash(event1) != hash(event3)
285285

286-
287286
class TestNodeFailingOverEvent:
288287
"""Test the NodeFailingOverEvent class."""
289288

@@ -361,7 +360,6 @@ def test_equality_and_hash(self):
361360
assert hash(event1) == hash(event2)
362361
assert hash(event1) != hash(event3)
363362

364-
365363
class TestMaintenanceEventsConfig:
366364
"""Test the MaintenanceEventsConfig class."""
367365

@@ -564,6 +562,7 @@ def test_handle_event_migrating(self):
564562
self.handler.handle_event(event)
565563
mock_handle.assert_called_once_with(MaintenanceState.MIGRATING)
566564

565+
567566
def test_handle_event_migrated(self):
568567
"""Test handling of NodeMigratedEvent."""
569568
event = NodeMigratedEvent(id=1)
@@ -668,6 +667,7 @@ def test_handle_maintenance_completed_event_success(self):
668667
self.handler.handle_maintenance_completed_event()
669668

670669
assert self.mock_connection.maintenance_state == MaintenanceState.NONE
670+
671671
self.mock_connection.update_current_socket_timeout.assert_called_once_with(-1)
672672
self.mock_connection.reset_tmp_settings.assert_called_once_with(
673673
reset_relax_timeout=True

0 commit comments

Comments
 (0)