Skip to content

Modify wait timeout in stream #42794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Adminiuga merged 5 commits into from
Nov 11, 2020
Merged

Modify wait timeout in stream #42794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f6f80b
Set wait timeout to 40
uvjustin Nov 3, 2020
d68fe86
Use dynamic wait_timeout
uvjustin Nov 5, 2020
4dd17d4
Catch error in container open
uvjustin Nov 5, 2020
2f160d2
Get restart times from const.py
uvjustin Nov 6, 2020
ae764dc
Fix test_stream_keepalive
uvjustin Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions homeassistant/components/stream/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@

MAX_MISSING_DTS = 6 # Number of packets missing DTS to allow
STREAM_TIMEOUT = 30 # Timeout for reading stream

STREAM_RESTART_INCREMENT = 10 # Increase wait_timeout by this amount each retry
STREAM_RESTART_RESET_TIME = 300 # Reset wait_timeout after this many seconds
19 changes: 16 additions & 3 deletions homeassistant/components/stream/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
MAX_TIMESTAMP_GAP,
MIN_SEGMENT_DURATION,
PACKETS_TO_WAIT_FOR_AUDIO,
STREAM_RESTART_INCREMENT,
STREAM_RESTART_RESET_TIME,
STREAM_TIMEOUT,
)
from .core import Segment, StreamBuffer
Expand Down Expand Up @@ -56,8 +58,13 @@ def stream_worker(hass, stream, quit_event):
_LOGGER.exception("Stream connection failed: %s", stream.source)
if not stream.keepalive or quit_event.is_set():
break
# To avoid excessive restarts, don't restart faster than once every 40 seconds.
wait_timeout = max(40 - (time.time() - start_time), 0)
# To avoid excessive restarts, wait before restarting
# As the required recovery time may be different for different setups, start
# with trying a short wait_timeout and increase it on each reconnection attempt.
# Reset the wait_timeout after the worker has been up for several minutes
if time.time() - start_time > STREAM_RESTART_RESET_TIME:
wait_timeout = 0
wait_timeout += STREAM_RESTART_INCREMENT
_LOGGER.debug(
"Restarting stream worker in %d seconds: %s",
wait_timeout,
Expand All @@ -68,7 +75,13 @@ def stream_worker(hass, stream, quit_event):
def _stream_worker_internal(hass, stream, quit_event):
"""Handle consuming streams."""

container = av.open(stream.source, options=stream.options, timeout=STREAM_TIMEOUT)
try:
container = av.open(
stream.source, options=stream.options, timeout=STREAM_TIMEOUT
)
except av.AVError:
_LOGGER.error("Error opening stream %s", stream.source)
return
try:
video_stream = container.streams.video[0]
except (KeyError, IndexError):
Expand Down
4 changes: 3 additions & 1 deletion tests/components/stream/test_hls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ def time_side_effect():

with patch("av.open") as av_open, patch(
"homeassistant.components.stream.worker.time"
) as mock_time:
) as mock_time, patch(
"homeassistant.components.stream.worker.STREAM_RESTART_INCREMENT", 0
):
av_open.side_effect = av.error.InvalidDataError(-2, "error")
mock_time.time.side_effect = time_side_effect
# Request stream
Expand Down