From c80c389d7119eb87d2e0787df6c30fb36f27e2fa Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Sun, 4 Feb 2024 13:47:28 +0100
Subject: [PATCH 1/6] [commands::run_server_process]: fix race condition

---
 src/commands.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/commands.rs b/src/commands.rs
index e4b9a6a85..b9d58e6d5 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -89,6 +89,13 @@ fn run_server_process(startup_timeout: Option<Duration>) -> Result<ServerStartup
     let runtime = Runtime::new()?;
     let exe_path = env::current_exe()?;
     let workdir = exe_path.parent().expect("executable path has no parent?!");
+
+    // Spawn a blocking task to bind the Unix socket
+    let sp = socket_path.clone();
+    let listener = runtime.block_on(async move {
+        tokio::net::UnixListener::bind(sp).expect("Failed to bind Unix socket")
+    });
+
     let _child = process::Command::new(&exe_path)
         .current_dir(workdir)
         .env("SCCACHE_START_SERVER", "1")
@@ -97,7 +104,6 @@ fn run_server_process(startup_timeout: Option<Duration>) -> Result<ServerStartup
         .spawn()?;
 
     let startup = async move {
-        let listener = tokio::net::UnixListener::bind(&socket_path)?;
         let (socket, _) = listener.accept().await?;
 
         read_server_startup_status(socket).await

From 3d9ad9b9180eab11e7aadb7269d9513310b5e46b Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Mon, 5 Feb 2024 10:13:31 +0100
Subject: [PATCH 2/6] fixup! return error from bind directly

---
 src/commands.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/commands.rs b/src/commands.rs
index b9d58e6d5..4230126c6 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -93,8 +93,8 @@ fn run_server_process(startup_timeout: Option<Duration>) -> Result<ServerStartup
     // Spawn a blocking task to bind the Unix socket
     let sp = socket_path.clone();
     let listener = runtime.block_on(async move {
-        tokio::net::UnixListener::bind(sp).expect("Failed to bind Unix socket")
-    });
+        tokio::net::UnixListener::bind(sp)
+    })?;
 
     let _child = process::Command::new(&exe_path)
         .current_dir(workdir)

From 8896b354bdf51511916ca2dd2cd36130d1034c36 Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Mon, 5 Feb 2024 10:28:15 +0100
Subject: [PATCH 3/6] fixup! fmt

---
 src/commands.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/commands.rs b/src/commands.rs
index 4230126c6..064444aac 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -92,9 +92,7 @@ fn run_server_process(startup_timeout: Option<Duration>) -> Result<ServerStartup
 
     // Spawn a blocking task to bind the Unix socket
     let sp = socket_path.clone();
-    let listener = runtime.block_on(async move {
-        tokio::net::UnixListener::bind(sp)
-    })?;
+    let listener = runtime.block_on(async move { tokio::net::UnixListener::bind(sp) })?;
 
     let _child = process::Command::new(&exe_path)
         .current_dir(workdir)

From b494bf9b10cad6fe55c48b6b59f38f45610074e9 Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Mon, 5 Feb 2024 12:07:09 +0100
Subject: [PATCH 4/6] fixup! explain race avoidance

---
 src/commands.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/commands.rs b/src/commands.rs
index 064444aac..308d6a54b 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -90,7 +90,9 @@ fn run_server_process(startup_timeout: Option<Duration>) -> Result<ServerStartup
     let exe_path = env::current_exe()?;
     let workdir = exe_path.parent().expect("executable path has no parent?!");
 
-    // Spawn a blocking task to bind the Unix socket
+    // Spawn a blocking task to bind the Unix socket. Note that the socket
+    // must be bound before spawning `_child` below to avoid a race between
+    // the parent binding the socket and the child connecting to it.
     let sp = socket_path.clone();
     let listener = runtime.block_on(async move { tokio::net::UnixListener::bind(sp) })?;
 

From ec2f3361d9449004c849863a7ac91c1c616d45da Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Tue, 6 Feb 2024 09:56:25 +0100
Subject: [PATCH 5/6] fixup! simply code for listener

---
 src/commands.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/commands.rs b/src/commands.rs
index 308d6a54b..fec86e832 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -93,8 +93,10 @@ fn run_server_process(startup_timeout: Option<Duration>) -> Result<ServerStartup
     // Spawn a blocking task to bind the Unix socket. Note that the socket
     // must be bound before spawning `_child` below to avoid a race between
     // the parent binding the socket and the child connecting to it.
-    let sp = socket_path.clone();
-    let listener = runtime.block_on(async move { tokio::net::UnixListener::bind(sp) })?;
+    let listener = {
+        let _guard = runtime.enter();
+        tokio::net::UnixListener::bind(&socket_path.clone())?
+    };
 
     let _child = process::Command::new(&exe_path)
         .current_dir(workdir)

From b23a0a5f1c7ba2dc6aca3debff267241ef00406e Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Wed, 7 Feb 2024 10:43:31 +0100
Subject: [PATCH 6/6] fixup! remove redundant clone()

---
 src/commands.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands.rs b/src/commands.rs
index fec86e832..ab740582e 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -95,7 +95,7 @@ fn run_server_process(startup_timeout: Option<Duration>) -> Result<ServerStartup
     // the parent binding the socket and the child connecting to it.
     let listener = {
         let _guard = runtime.enter();
-        tokio::net::UnixListener::bind(&socket_path.clone())?
+        tokio::net::UnixListener::bind(&socket_path)?
     };
 
     let _child = process::Command::new(&exe_path)