Try to reduce TIME_WAIT

Author: brunorijsman

client/__main__.py

@@ -107,7 +107,7 @@ async def post_mgmt_stop():
     utils.delete_pid_file("client", _CLIENT.name)
     # TODO: Process close listening socket when receive SIGTERM
     os.kill(os.getpid(), signal.SIGTERM)
-    return {"result": "Hub stopped"}
+    return {"result": "Client stopped"}
 
 
 def main():

hub/__main__.py

@@ -3,8 +3,6 @@
 """
 
 import argparse
-import os
-import signal
 import fastapi
 import pydantic
 import uvicorn
@@ -156,11 +154,8 @@ async def post_mgmt_stop():
     """
     Management: Post stop.
     """
-    # TODO: Can we delete the PID file later, when the process actually terminates?
-    utils.delete_pid_file("hub", _HUB.name)
-    os.kill(os.getpid(), signal.SIGTERM)
-    # TODO: Does this result actually get returned
-    return {"result": "Hub stopped"}
+    _HUB.initiate_stop()
+    return {"result": "Hub stop initiated"}
 
 
 def main():

hub/hub.py

@@ -2,9 +2,13 @@
 A DSKE security hub, or DSKE hub, or just hub for short.
 """
 
+import asyncio
+import os
+import signal
 from uuid import UUID
 import fastapi
 from common import exceptions
+from common import utils
 from common.allocation import Allocation
 from common.block import Block
 from common.encryption_key import EncryptionKey
@@ -23,11 +27,13 @@ class Hub:
     _name: str
     _peer_clients: dict[str, PeerClient]  # Indexed by client name
     _shares: dict[UUID, Share]  # Indexed by key UUID
+    _stop_task: asyncio.Task | None
 
     def __init__(self, name: str):
         self._name = name
         self._peer_clients = {}
         self._shares = {}
+        self._stop_task = None
 
     @property
     def name(self):
@@ -139,3 +145,18 @@ async def get_share_requested_by_client(
         )
         peer_client.add_dske_signing_key_header_to_response(headers_temp_response)
         return response
+
+    def initiate_stop(self):
+        """
+        Initiate stopping the hub.
+        """
+        self._stop_task = asyncio.create_task(self._stop_after_delay())
+
+    async def _stop_after_delay(self):
+        """
+        Stop the hub after a short delay to allow the HTTP response to be sent and to avoid
+        TIME_WAIT states on the server.
+        """
+        await asyncio.sleep(0.5)
+        utils.delete_pid_file("hub", self._name)
+        os.kill(os.getpid(), signal.SIGTERM)