BUGFIX:

- Wait for mission file release on server.stop() to avoid race conditions on upload()

Author: karel26

core/data/impl/serverimpl.py

@@ -646,6 +646,27 @@ async def _terminate(self) -> None:
         finally:
             self.process = None
 
+    @performance_log()
+    async def stop(self) -> None:
+        async def wait_for_file_release(timeout: int):
+            mission_file = self._get_current_mission_file()
+            if not mission_file:
+                return
+            for i in range(0, timeout * 2):
+                try:
+                    with open(mission_file, mode='a'):
+                        return
+                except PermissionError:
+                    await asyncio.sleep(0.5)
+            else:
+                raise TimeoutError()
+
+        if self.status in [Status.PAUSED, Status.RUNNING]:
+            timeout = 120 if self.node.locals.get('slow_system', False) else 60
+            await self.send_to_dcs({"command": "stop_server"})
+            await self.wait_for_status_change([Status.STOPPED], timeout)
+            await wait_for_file_release(10)
+
     @performance_log()
     async def apply_mission_changes(self, filename: Optional[str] = None) -> str:
         # disable autoscan

core/data/proxy/serverproxy.py

@@ -111,6 +111,15 @@ async def shutdown(self, force: bool = False) -> None:
             }, node=self.node.name, timeout=timeout)
             self.status = Status.SHUTDOWN
 
+    async def stop(self) -> None:
+        timeout = 180 if not self.node.slow_system else 300
+        await self.bus.send_to_node_sync({
+            "command": "rpc",
+            "object": "Server",
+            "method": "stop",
+            "server_name": self.name
+        }, node=self.node.name, timeout=timeout)
+
     async def init_extensions(self) -> list[str]:
         timeout = 180 if not self.node.slow_system else 300
         data = await self.bus.send_to_node_sync({

core/data/server.py

@@ -313,12 +313,8 @@ async def playSound(self, recipient: Union[Coalition, str], sound: str):
             "sound": sound
         })
 
-    @performance_log()
     async def stop(self) -> None:
-        if self.status in [Status.PAUSED, Status.RUNNING]:
-            timeout = 120 if self.node.locals.get('slow_system', False) else 60
-            await self.send_to_dcs({"command": "stop_server"})
-            await self.wait_for_status_change([Status.STOPPED], timeout)
+        raise NotImplemented()
 
     @performance_log()
     async def start(self) -> bool: