Skip to content

Commit

Permalink
fix: handle ConnectionError in rapu._handle_messages
Browse files Browse the repository at this point in the history
If client connection is broken there is nothing the server
can do. Handle the specific case and silence stats and reporting.
The aiohttp expects a response object, although this is not and
cannot be written to client as the connection is already broken.
  • Loading branch information
jjaakola-aiven committed May 6, 2024
1 parent a75cde8 commit 2782bd5
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
5 changes: 5 additions & 0 deletions karapace/rapu.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,11 @@ async def _handle_request(
)
headers = {"Content-Type": "application/json"}
resp = aiohttp.web.Response(body=body, status=status.value, headers=headers)
except ConnectionError as connection_error:
# TCP level connection errors, e.g. TCP reset, client closes connection.
self.log.debug("Connection error.", exc_info=connection_error)
# No response can be returned and written to client, aiohttp expects some response here.
resp = aiohttp.web.Response(text="Connection error", status=HTTPStatus.INTERNAL_SERVER_ERROR.value)
except asyncio.CancelledError:
self.log.debug("Client closed connection")
raise
Expand Down
21 changes: 21 additions & 0 deletions tests/unit/test_rapu.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
Copyright (c) 2023 Aiven Ltd
See LICENSE for details
"""
from karapace.config import DEFAULTS
from karapace.karapace import KarapaceBase
from karapace.rapu import HTTPRequest, REST_ACCEPT_RE, REST_CONTENT_TYPE_RE
from unittest.mock import Mock


async def test_header_get():
Expand Down Expand Up @@ -154,3 +157,21 @@ def test_content_type_re():
"serialization_format": "json",
"general_format": None,
}


async def test_raise_connection_error_handling() -> None:
request_mock = Mock()
request_mock.read.side_effect = ConnectionError("Connection error test.")
callback_mock = Mock()

app = KarapaceBase(config=DEFAULTS)

response = await app._handle_request( # pylint: disable=protected-access
request=request_mock,
path_for_stats="/",
callback=callback_mock,
)

assert response.status == 500
request_mock.read.assert_has_calls([])
callback_mock.assert_not_called()

0 comments on commit 2782bd5

Please sign in to comment.