undo chnages

Author: deependujha

src/lightning/fabric/plugins/environments/lightning.py

@@ -13,11 +13,11 @@
 # limitations under the License.
 
 import os
+import socket
 
 from typing_extensions import override
 
 from lightning.fabric.plugins.environments.cluster_environment import ClusterEnvironment
-from lightning.fabric.utilities.port_manager import get_port_manager
 from lightning.fabric.utilities.rank_zero import rank_zero_only
 
 
@@ -104,38 +104,18 @@ def teardown(self) -> None:
         if "WORLD_SIZE" in os.environ:
             del os.environ["WORLD_SIZE"]
 
-        if self._main_port != -1:
-            get_port_manager().release_port(self._main_port)
-            self._main_port = -1
-
-        os.environ.pop("MASTER_PORT", None)
-        os.environ.pop("MASTER_ADDR", None)
-
 
 def find_free_network_port() -> int:
     """Finds a free port on localhost.
 
     It is useful in single-node training when we don't want to connect to a real main node but have to set the
     `MASTER_PORT` environment variable.
 
-    The allocated port is reserved and won't be returned by subsequent calls until it's explicitly released.
-
-    Returns:
-        A port number that is reserved and free at the time of allocation
-
     """
     # If an external launcher already specified a MASTER_PORT (for example, torch.distributed.spawn or
     # multiprocessing helpers), reserve it through the port manager so no other test reuses the same number.
-    if "MASTER_PORT" in os.environ:
-        master_port_str = os.environ["MASTER_PORT"]
-        try:
-            existing_port = int(master_port_str)
-        except ValueError:
-            pass
-        else:
-            port_manager = get_port_manager()
-            if port_manager.reserve_existing_port(existing_port):
-                return existing_port
-
-    port_manager = get_port_manager()
-    return port_manager.allocate_port()
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    s.bind(("", 0))
+    port = s.getsockname()[1]
+    s.close()
+    return port

src/lightning/fabric/utilities/port_manager.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import contextlib
 import os
 import sys
 import threading
@@ -78,30 +77,10 @@ def restore_env_variables():
 @pytest.fixture(autouse=True)
 def teardown_process_group():
     """Ensures that the distributed process group gets closed before the next test runs."""
-    from lightning.fabric.utilities.port_manager import get_port_manager
-
-    # Record the port used in this test (if any)
-    port_to_release = None
-    if "MASTER_PORT" in os.environ:
-        with contextlib.suppress(ValueError, KeyError):
-            port_to_release = int(os.environ["MASTER_PORT"])
-
     yield
-
-    # Clean up distributed connection
     _destroy_dist_connection()
 
-    manager = get_port_manager()
-
-    # Release the port from the manager so it can be reused
-    if port_to_release is not None:
-        manager.release_port(port_to_release)
-
-    # If the process group updated MASTER_PORT, reserve and clear it to avoid leaking between tests
-    if "MASTER_PORT" in os.environ:
-        with contextlib.suppress(ValueError):
-            manager.reserve_existing_port(int(os.environ["MASTER_PORT"]))
-        os.environ.pop("MASTER_PORT", None)
+    os.environ.pop("MASTER_PORT", None)
 
 
 @pytest.fixture(autouse=True)

tests/tests_fabric/conftest.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import contextlib
 import os
 import signal
 import sys
@@ -128,30 +127,11 @@ def restore_signal_handlers():
 @pytest.fixture(autouse=True)
 def teardown_process_group():
     """Ensures that the distributed process group gets closed before the next test runs."""
-    from lightning.fabric.utilities.port_manager import get_port_manager
-
-    # Record the port used in this test (if any)
-    port_to_release = None
-    if "MASTER_PORT" in os.environ:
-        with contextlib.suppress(ValueError, KeyError):
-            port_to_release = int(os.environ["MASTER_PORT"])
-
     yield
-
-    # Clean up distributed connection
     _destroy_dist_connection()
 
-    manager = get_port_manager()
-
-    # Release the port from the manager so it can be reused
-    if port_to_release is not None:
-        manager.release_port(port_to_release)
-
-    # If the process group updated MASTER_PORT, reserve and clear it to avoid leaking between tests
-    if "MASTER_PORT" in os.environ:
-        with contextlib.suppress(ValueError):
-            manager.reserve_existing_port(int(os.environ["MASTER_PORT"]))
-        os.environ.pop("MASTER_PORT", None)
+    # clean MASTER_PORT environment variable, to avoid leaking between tests
+    os.environ.pop("MASTER_PORT", None)
 
 
 @pytest.fixture(autouse=True)