mirror of
https://github.com/Dispatcharr/Dispatcharr.git
synced 2026-07-18 00:55:50 +00:00
fix(proxy): enhance database connection management during VOD playback and stats updates
- Added calls to `close_old_connections()` in `stream_vod()` and `build_vod_stats_data()` to prevent connection leaks during long-lived streaming responses and background stats refreshes. - Improved connection handling in various components to ensure proper resource cleanup and prevent blocking issues.
This commit is contained in:
SergeantPanda
parent
c389462dde
commit
7989fa3673
8 changed files with 198 additions and 19 deletions
|
|
@ -67,6 +67,7 @@ class StreamManager:
|
|||
# Add to your __init__ method
|
||||
self._buffer_check_timers = []
|
||||
self.stopping = False
|
||||
self.stop_requested = False
|
||||
|
||||
# Add tracking for tried streams and current stream
|
||||
self.current_stream_id = stream_id
|
||||
|
|
@ -572,7 +573,9 @@ class StreamManager:
|
|||
try:
|
||||
metadata_key = RedisKeys.channel_metadata(self.channel_id)
|
||||
owner_key = RedisKeys.channel_owner(self.channel_id)
|
||||
current_owner = self.buffer.redis_client.get(owner_key)
|
||||
current_owner = self._decode_redis_value(
|
||||
self.buffer.redis_client.get(owner_key)
|
||||
)
|
||||
|
||||
is_owner = (
|
||||
current_owner
|
||||
|
|
@ -583,12 +586,10 @@ class StreamManager:
|
|||
|
||||
should_update = is_owner
|
||||
if not should_update and no_owner:
|
||||
current_state_bytes = self.buffer.redis_client.hget(
|
||||
metadata_key, ChannelMetadataField.STATE
|
||||
)
|
||||
current_state = (
|
||||
current_state_bytes
|
||||
if current_state_bytes else None
|
||||
current_state = self._decode_redis_value(
|
||||
self.buffer.redis_client.hget(
|
||||
metadata_key, ChannelMetadataField.STATE
|
||||
)
|
||||
)
|
||||
should_update = current_state in ChannelState.PRE_ACTIVE
|
||||
if not should_update and current_state:
|
||||
|
|
|
|||
|
|
@ -1402,6 +1402,15 @@ class ProxyServer:
|
|||
f"Error broadcasting upstream stop for channel {channel_id}: {e}"
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def _channel_id_from_metadata_key(key):
|
||||
if isinstance(key, bytes):
|
||||
key = key.decode('utf-8', errors='replace')
|
||||
parts = key.split(':')
|
||||
if len(parts) >= 3:
|
||||
return parts[2]
|
||||
return None
|
||||
|
||||
def _stop_upstream_before_redis_cleanup(self, channel_id):
|
||||
"""Stop local ffmpeg before deleting Redis keys (prevents delete/recreate loops)."""
|
||||
if self._has_local_upstream_activity(channel_id):
|
||||
|
|
@ -1955,7 +1964,9 @@ class ProxyServer:
|
|||
|
||||
for key in channel_keys:
|
||||
try:
|
||||
channel_id = key.split(':')[2]
|
||||
channel_id = self._channel_id_from_metadata_key(key)
|
||||
if not channel_id:
|
||||
continue
|
||||
|
||||
# Check if this channel has an owner
|
||||
owner = self.get_channel_owner(channel_id)
|
||||
|
|
@ -1995,7 +2006,9 @@ class ProxyServer:
|
|||
|
||||
for key in channel_keys:
|
||||
try:
|
||||
channel_id = key.split(':')[2]
|
||||
channel_id = self._channel_id_from_metadata_key(key)
|
||||
if not channel_id:
|
||||
continue
|
||||
|
||||
# Get metadata first
|
||||
metadata = self.redis_client.hgetall(key)
|
||||
|
|
|
|||
146
apps/proxy/vod_proxy/tests/test_vod_db_cleanup.py
Normal file
146
apps/proxy/vod_proxy/tests/test_vod_db_cleanup.py
Normal file
|
|
@ -0,0 +1,146 @@
|
|||
"""VOD proxy must release geventpool checkouts after ORM on stream and stats paths."""
|
||||
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
from django.http import StreamingHttpResponse
|
||||
from django.test import RequestFactory, SimpleTestCase
|
||||
|
||||
|
||||
class StreamVodDbCleanupTests(SimpleTestCase):
|
||||
def setUp(self):
|
||||
self.factory = RequestFactory()
|
||||
|
||||
@patch("apps.proxy.vod_proxy.views.close_old_connections")
|
||||
@patch("apps.proxy.vod_proxy.views.MultiWorkerVODConnectionManager")
|
||||
@patch("apps.proxy.vod_proxy.views._transform_url", return_value="http://example.com/movie.mp4")
|
||||
@patch("apps.proxy.vod_proxy.views._get_m3u_profile")
|
||||
@patch("apps.proxy.vod_proxy.views._get_stream_url_from_relation", return_value="http://upstream/movie.mp4")
|
||||
@patch("apps.proxy.vod_proxy.views._get_content_and_relation")
|
||||
@patch("apps.proxy.vod_proxy.views.network_access_allowed", return_value=True)
|
||||
def test_stream_vod_closes_db_before_streaming_response(
|
||||
self,
|
||||
_network_ok,
|
||||
mock_content,
|
||||
_stream_url,
|
||||
mock_profile,
|
||||
_transform,
|
||||
mock_manager_cls,
|
||||
mock_close,
|
||||
):
|
||||
movie = MagicMock()
|
||||
movie.name = "Test Movie"
|
||||
relation = MagicMock()
|
||||
relation.m3u_account.name = "Provider"
|
||||
mock_content.return_value = (movie, relation)
|
||||
|
||||
profile = MagicMock()
|
||||
profile.id = 1
|
||||
profile.max_streams = 5
|
||||
mock_profile.return_value = (profile, 0)
|
||||
|
||||
mock_manager = MagicMock()
|
||||
mock_manager.stream_content_with_session.return_value = StreamingHttpResponse(
|
||||
streaming_content=iter([b"data"]),
|
||||
content_type="video/mp4",
|
||||
)
|
||||
mock_manager_cls.get_instance.return_value = mock_manager
|
||||
|
||||
request = self.factory.get(
|
||||
"/proxy/vod/movie/uuid/session123/",
|
||||
HTTP_USER_AGENT="test-agent",
|
||||
)
|
||||
request.user = MagicMock(is_authenticated=False)
|
||||
|
||||
from apps.proxy.vod_proxy.views import stream_vod
|
||||
|
||||
response = stream_vod(
|
||||
request,
|
||||
content_type="movie",
|
||||
content_id="uuid",
|
||||
session_id="session123",
|
||||
)
|
||||
|
||||
self.assertIsInstance(response, StreamingHttpResponse)
|
||||
mock_close.assert_called_once()
|
||||
mock_manager.stream_content_with_session.assert_called_once()
|
||||
|
||||
|
||||
class BuildVodStatsDbCleanupTests(SimpleTestCase):
|
||||
@patch("apps.proxy.vod_proxy.views.close_old_connections")
|
||||
@patch("apps.proxy.vod_proxy.views.Movie")
|
||||
def test_build_vod_stats_data_closes_db(self, mock_movie, mock_close):
|
||||
redis_client = MagicMock()
|
||||
redis_client.scan.side_effect = [
|
||||
(0, ["vod_persistent_connection:s1"]),
|
||||
]
|
||||
redis_client.hgetall.return_value = {
|
||||
"content_obj_type": "movie",
|
||||
"content_uuid": "movie-uuid",
|
||||
"content_name": "Test Movie",
|
||||
"m3u_profile_id": "1",
|
||||
"client_ip": "127.0.0.1",
|
||||
"client_user_agent": "agent",
|
||||
"connected_at": "1000.0",
|
||||
"last_activity": "1001.0",
|
||||
"active_streams": "1",
|
||||
}
|
||||
|
||||
movie_obj = MagicMock(
|
||||
name="Test Movie",
|
||||
logo=None,
|
||||
year=2020,
|
||||
rating=7.5,
|
||||
genre="Action",
|
||||
description="Desc",
|
||||
tmdb_id="1",
|
||||
imdb_id="tt1",
|
||||
)
|
||||
mock_movie.objects.select_related.return_value.get.return_value = movie_obj
|
||||
|
||||
with patch("apps.m3u.models.M3UAccountProfile") as mock_profile_model:
|
||||
mock_profile_model.objects.select_related.return_value.get.return_value = MagicMock(
|
||||
name="Profile 1",
|
||||
m3u_account=MagicMock(name="Account", id=1),
|
||||
)
|
||||
|
||||
from apps.proxy.vod_proxy.views import build_vod_stats_data
|
||||
|
||||
stats = build_vod_stats_data(redis_client)
|
||||
|
||||
self.assertEqual(stats["total_connections"], 1)
|
||||
mock_close.assert_called_once()
|
||||
|
||||
@patch("apps.proxy.vod_proxy.views.close_old_connections")
|
||||
def test_build_vod_stats_data_closes_db_on_error(self, mock_close):
|
||||
redis_client = MagicMock()
|
||||
redis_client.scan.side_effect = RuntimeError("redis down")
|
||||
|
||||
from apps.proxy.vod_proxy.views import build_vod_stats_data
|
||||
|
||||
stats = build_vod_stats_data(redis_client)
|
||||
|
||||
self.assertEqual(stats["total_connections"], 0)
|
||||
mock_close.assert_called_once()
|
||||
|
||||
|
||||
class VodStatsUpdateDbCleanupTests(SimpleTestCase):
|
||||
@patch("core.utils.send_websocket_update")
|
||||
@patch("apps.proxy.vod_proxy.views.build_vod_stats_data")
|
||||
def test_do_vod_stats_update_uses_build_vod_stats_data(self, mock_build, mock_ws):
|
||||
mock_build.return_value = {
|
||||
"vod_connections": [],
|
||||
"total_connections": 0,
|
||||
"timestamp": 0,
|
||||
}
|
||||
|
||||
from apps.proxy.vod_proxy.multi_worker_connection_manager import (
|
||||
MultiWorkerVODConnectionManager,
|
||||
)
|
||||
|
||||
manager = MultiWorkerVODConnectionManager.__new__(MultiWorkerVODConnectionManager)
|
||||
manager.redis_client = MagicMock()
|
||||
|
||||
manager._do_vod_stats_update()
|
||||
|
||||
mock_build.assert_called_once_with(manager.redis_client)
|
||||
mock_ws.assert_called_once()
|
||||
|
|
@ -8,6 +8,7 @@ import random
|
|||
import logging
|
||||
import requests
|
||||
from urllib.parse import urlencode
|
||||
from django.db import close_old_connections
|
||||
from django.http import JsonResponse, Http404, HttpResponse
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
|
|
@ -601,6 +602,9 @@ def stream_vod(request, content_type, content_id, session_id=None, profile_id=No
|
|||
# Get connection manager (Redis-backed for multi-worker support)
|
||||
connection_manager = MultiWorkerVODConnectionManager.get_instance()
|
||||
|
||||
# Release ORM checkout before returning a long-lived StreamingHttpResponse.
|
||||
close_old_connections()
|
||||
|
||||
# Stream the content with session-based connection reuse
|
||||
logger.info("[VOD-STREAM] Calling connection manager to stream content")
|
||||
response = connection_manager.stream_content_with_session(
|
||||
|
|
@ -1063,6 +1067,8 @@ def build_vod_stats_data(redis_client):
|
|||
except Exception as e:
|
||||
logger.error(f"Error building VOD stats: {e}")
|
||||
return {'vod_connections': [], 'total_connections': 0, 'timestamp': time.time()}
|
||||
finally:
|
||||
close_old_connections()
|
||||
|
||||
|
||||
@api_view(["GET"])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue