From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Tue, 28 Mar 2023 20:32:58 +0000 (+0200)
Subject: Fix system lockup caused by SMB Provider (#591)
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=9beae91fc9cf4d0b5b1d9b1baa8591c5ea3f7b59;p=music-assistant-server.git

Fix system lockup caused by SMB Provider (#591)

* Fix: SMB Files provider deadlock

* prevent annoying BrokenPipe error
---

diff --git a/music_assistant/server/helpers/process.py b/music_assistant/server/helpers/process.py
index e082e5f2..164cc44e 100644
--- a/music_assistant/server/helpers/process.py
+++ b/music_assistant/server/helpers/process.py
@@ -45,6 +45,13 @@ class AsyncProcess:
             stderr=asyncio.subprocess.PIPE if self._enable_stderr else None,
             close_fds=True,
         )
+
+        # Fix BrokenPipeError due to a race condition
+        # by attaching a default done callback
+        def _done_cb(fut: asyncio.Future):
+            fut.exception()
+
+        self._proc._transport._protocol._stdin_closed.add_done_callback(_done_cb)
         return self
 
     async def __aexit__(self, exc_type, exc_value, traceback) -> bool:
diff --git a/music_assistant/server/helpers/tags.py b/music_assistant/server/helpers/tags.py
index 00c2d582..e4fa31e5 100644
--- a/music_assistant/server/helpers/tags.py
+++ b/music_assistant/server/helpers/tags.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import json
+import logging
 import os
 from collections.abc import AsyncGenerator
 from dataclasses import dataclass
@@ -12,9 +13,11 @@ from music_assistant.common.helpers.util import try_parse_int
 from music_assistant.common.models.enums import AlbumType
 from music_assistant.common.models.errors import InvalidDataError
 from music_assistant.common.models.media_items import MediaItemChapter
-from music_assistant.constants import UNKNOWN_ARTIST
+from music_assistant.constants import ROOT_LOGGER_NAME, UNKNOWN_ARTIST
 from music_assistant.server.helpers.process import AsyncProcess
 
+LOGGER = logging.getLogger(ROOT_LOGGER_NAME).getChild("tags")
+
 # the only multi-item splitter we accept is the semicolon,
 # which is also the default in Musicbrainz Picard.
 # the slash is also a common splitter but causes colissions with
@@ -328,7 +331,8 @@ async def parse_tags(
                             # end of the file
                             # we'll have to read the entire file to do something with it
                             # for now we just ignore/deny these files
-                            raise RuntimeError("Tags not present at beginning of file")
+                            LOGGER.error("Found file with tags not present at beginning of file")
+                            break
                 finally:
                     proc.write_eof()
 
diff --git a/music_assistant/server/helpers/util.py b/music_assistant/server/helpers/util.py
index b35a9a9a..0ed59a54 100644
--- a/music_assistant/server/helpers/util.py
+++ b/music_assistant/server/helpers/util.py
@@ -5,6 +5,7 @@ import asyncio
 import importlib
 import logging
 from collections.abc import AsyncGenerator, Iterator
+from contextlib import suppress
 from functools import lru_cache
 from typing import TYPE_CHECKING, Any
 
@@ -45,16 +46,15 @@ async def async_iter(sync_iterator: Iterator, *args, **kwargs) -> AsyncGenerator
     # inspired by: https://stackoverflow.com/questions/62294385/synchronous-generator-in-asyncio
     loop = asyncio.get_running_loop()
     queue = asyncio.Queue(1)
+    _exit = asyncio.Event()
     _end_ = object()
 
     def iter_to_queue():
-        try:
-            for item in sync_iterator(*args, **kwargs):
-                if queue is None:
-                    break
-                asyncio.run_coroutine_threadsafe(queue.put(item), loop).result()
-        finally:
-            asyncio.run_coroutine_threadsafe(queue.put(_end_), loop).result()
+        for item in sync_iterator(*args, **kwargs):
+            if _exit.is_set():
+                return
+            asyncio.run_coroutine_threadsafe(queue.put(item), loop).result()
+        asyncio.run_coroutine_threadsafe(queue.put(_end_), loop).result()
 
     iter_fut = loop.run_in_executor(None, iter_to_queue)
     try:
@@ -64,6 +64,10 @@ async def async_iter(sync_iterator: Iterator, *args, **kwargs) -> AsyncGenerator
                 break
             yield next_item
     finally:
-        queue = None
+        # cleanup
+        _exit.set()
         if not iter_fut.done():
             iter_fut.cancel()
+            await iter_fut
+        with suppress(asyncio.QueueEmpty):
+            queue.get_nowait()