Merge pull request #8737 from RasaHQ/8727-redis-error

Fix Redis errors as RasaException subclass

changelog/8727.misc.md

@@ -0,0 +1 @@
+Catch `ConnectionError` during `TrackerStore` and `LockStore` creation and re-raise as `RasaException` subclass, `ConnectionException`.

rasa/core/lock_store.py

@@ -6,7 +6,7 @@
 from async_generator import asynccontextmanager
 from typing import Text, Union, Optional, AsyncGenerator
 
-from rasa.shared.exceptions import RasaException
+from rasa.shared.exceptions import RasaException, ConnectionException
 import rasa.shared.utils.common
 from rasa.core.constants import DEFAULT_LOCK_LIFETIME
 from rasa.core.lock import TicketLock
@@ -43,8 +43,11 @@ def create(obj: Union["LockStore", EndpointConfig, None]) -> "LockStore":
 
         if isinstance(obj, LockStore):
             return obj
-        else:
+
+        try:
             return _create_from_endpoint_config(obj)
+        except ConnectionError as error:
+            raise ConnectionException("Cannot connect to lock store.") from error
 
     @staticmethod
     def create_lock(conversation_id: Text) -> TicketLock:

rasa/core/tracker_store.py

@@ -126,6 +126,7 @@ def create(
             BotoCoreError,
             pymongo.errors.ConnectionFailure,
             sqlalchemy.exc.OperationalError,
+            ConnectionError,
         ) as error:
             raise ConnectionException("Cannot connect to tracker store.") from error
 

tests/core/test_lock_store.py

@@ -16,13 +16,16 @@
 from rasa.core.constants import DEFAULT_LOCK_LIFETIME
 from rasa.shared.constants import INTENT_MESSAGE_PREFIX
 from rasa.core.lock import TicketLock
+import rasa.core.lock_store
 from rasa.core.lock_store import (
     InMemoryLockStore,
     LockError,
     LockStore,
     RedisLockStore,
     DEFAULT_REDIS_LOCK_STORE_KEY_PREFIX,
 )
+from rasa.shared.exceptions import ConnectionException
+from rasa.utils.endpoints import EndpointConfig
 
 
 class FakeRedisLockStore(RedisLockStore):
@@ -88,6 +91,17 @@ def test_create_lock_store(lock_store: LockStore):
     assert lock.conversation_id == conversation_id
 
 
+def test_raise_connection_exception_redis_lock_store(monkeypatch: MonkeyPatch):
+    monkeypatch.setattr(
+        rasa.core.lock_store, "RedisLockStore", Mock(side_effect=ConnectionError())
+    )
+
+    with pytest.raises(ConnectionException):
+        LockStore.create(
+            EndpointConfig(username="username", password="password", type="redis")
+        )
+
+
 @pytest.mark.parametrize("lock_store", [InMemoryLockStore(), FakeRedisLockStore()])
 def test_serve_ticket(lock_store: LockStore):
     conversation_id = "my id 1"

tests/core/test_tracker_stores.py

@@ -207,6 +207,20 @@ def test_exception_tracker_store_from_endpoint_config(
     assert "test exception" in str(e.value)
 
 
+def test_raise_connection_exception_redis_tracker_store_creation(
+    domain: Domain, monkeypatch: MonkeyPatch, endpoints_path: Text
+):
+    store = read_endpoint_config(endpoints_path, "tracker_store")
+    monkeypatch.setattr(
+        rasa.core.tracker_store,
+        "RedisTrackerStore",
+        Mock(side_effect=ConnectionError()),
+    )
+
+    with pytest.raises(ConnectionException):
+        TrackerStore.create(store, domain)
+
+
 class HostExampleTrackerStore(RedisTrackerStore):
     pass