[#247] PortManager__Generic uses lock-dirs for reserved ports

postgrespro · dmitry-lipetsk · May 6, 2025 · May 7, 2025 · May 7, 2025 · May 7, 2025
commit 99e645e8bcce52ac85d4dabdc6ae1e4bdceb4a17
diff --git a/testgres/consts.py b/testgres/consts.py
@@ -10,6 +10,10 @@
 TMP_CACHE = 'tgsc_'
 TMP_BACKUP = 'tgsb_'
 
+TMP_TESTGRES = "testgres"
+
+TMP_TESTGRES_PORTS = TMP_TESTGRES + "/ports"
+
 # path to control file
 XLOG_CONTROL_FILE = "global/pg_control"
 

diff --git a/testgres/impl/port_manager__generic.py b/testgres/impl/port_manager__generic.py
@@ -2,7 +2,9 @@
 
 from ..port_manager import PortManager
 from ..exceptions import PortForException
+from .. import consts
 
+import os
 import threading
 import random
 import typing
@@ -15,6 +17,8 @@ class PortManager__Generic(PortManager):
     _available_ports: typing.Set[int]
     _reserved_ports: typing.Set[int]
 
+    _lock_dir: str
+
     def __init__(self, os_ops: OsOperations):
         assert os_ops is not None
         assert isinstance(os_ops, OsOperations)
@@ -23,6 +27,12 @@ def __init__(self, os_ops: OsOperations):
         self._available_ports: typing.Set[int] = set(range(1024, 65535))
         self._reserved_ports: typing.Set[int] = set()
 
+        temp_dir = os_ops.get_tempdir()
+        assert type(temp_dir) == str  # noqa: E721
+        self._lock_dir = os.path.join(temp_dir, consts.TMP_TESTGRES_PORTS)
+        assert type(self._lock_dir) == str  # noqa: E721
+        os_ops.makedirs(self._lock_dir)
+
     def reserve_port(self) -> int:
         assert self._guard is not None
         assert type(self._available_ports) == set  # noqa: E721t
@@ -41,9 +51,23 @@ def reserve_port(self) -> int:
                 if not self._os_ops.is_port_free(port):
                     continue
 
-                self._reserved_ports.add(port)
-                self._available_ports.discard(port)
+                try:
+                    lock_path = self.helper__make_lock_path(port)
+                    self._os_ops.makedir(lock_path)
+                except:  # noqa: 722
+                    continue
+
+                assert self._os_ops.path_exists(lock_path)
+
+                try:
+                    self._reserved_ports.add(port)
+                except:  # noqa: 722
+                    assert not (port in self._reserved_ports)
+                    self._os_ops.rmdir(lock_path)
+                    raise
+
                 assert port in self._reserved_ports
+                self._available_ports.discard(port)
                 assert not (port in self._available_ports)
                 return port
 
@@ -55,10 +79,26 @@ def release_port(self, number: int) -> None:
         assert self._guard is not None
         assert type(self._reserved_ports) == set  # noqa: E721
 
+        lock_path = self.helper__make_lock_path(number)
+
         with self._guard:
             assert number in self._reserved_ports
             assert not (number in self._available_ports)
             self._available_ports.add(number)
             self._reserved_ports.discard(number)
             assert not (number in self._reserved_ports)
             assert number in self._available_ports
+
+            assert isinstance(self._os_ops, OsOperations)
+            assert self._os_ops.path_exists(lock_path)
+            self._os_ops.rmdir(lock_path)
+
+        return
+
+    def helper__make_lock_path(self, port_number: int) -> str:
+        assert type(port_number) == int  # noqa: E721
+        assert type(self._lock_dir) == str  # noqa: E721
+
+        result = os.path.join(self._lock_dir, str(port_number) + ".lock")
+        assert type(result) == str  # noqa: E721
+        return result