From 324833686462bfe194436b53db3412431d041131 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 28 Feb 2026 16:13:43 +0000
Subject: [PATCH 1/2] Initial plan


From 92b98bd1ecfe1538ab4549925c6db74a7773b69e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 28 Feb 2026 16:27:09 +0000
Subject: [PATCH 2/2] =?UTF-8?q?[exp][ci]:=20fix=20exp=5F006=20systemd=20po?=
 =?UTF-8?q?rt-conflict=20=E2=80=94=20add=20Preexisting=20AMF=20runtime=20+?=
 =?UTF-8?q?=20stop=20service=20in=20CI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: j143 <53068787+j143@users.noreply.github.com>
---
 .github/workflows/open5gs-integration.yml     | 12 ++++++++
 .../exp_006_open5g_core_comparison/run.rs     | 29 +++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/open5gs-integration.yml b/.github/workflows/open5gs-integration.yml
index 91c991d..9c07b83 100644
--- a/.github/workflows/open5gs-integration.yml
+++ b/.github/workflows/open5gs-integration.yml
@@ -66,6 +66,18 @@ jobs:
           echo "=== AMF config (active lines) ==="
           grep -v '^#' /etc/open5gs/amf.yaml | grep -v '^$'
 
+      # -----------------------------------------------------------------------
+      # Stop the open5gs-amfd systemd service that apt auto-started on install.
+      # Without this the experiment's spawn of open5gs-amfd fails immediately
+      # because SBI port 7777 and metrics port 9090 are already bound.
+      # -----------------------------------------------------------------------
+      - name: Stop systemd open5gs-amfd service (clean state for experiment)
+        run: |
+          sudo systemctl stop open5gs-amfd 2>/dev/null || true
+          sudo systemctl disable open5gs-amfd 2>/dev/null || true
+          # Give the OS a moment to release the bound ports.
+          sleep 1
+
       # -----------------------------------------------------------------------
       # Run the experiment.  The binary is on PATH so find_native_binary()
       # picks up /usr/bin/open5gs-amfd, starts it, reads /etc/open5gs/amf.yaml,
diff --git a/experiments/exp_006_open5g_core_comparison/run.rs b/experiments/exp_006_open5g_core_comparison/run.rs
index a669d95..e7c2102 100644
--- a/experiments/exp_006_open5g_core_comparison/run.rs
+++ b/experiments/exp_006_open5g_core_comparison/run.rs
@@ -62,6 +62,10 @@ enum AmfRuntime {
     NativePid(Child),
     /// Docker container (fallback for local development).
     Docker,
+    /// Pre-existing AMF instance already running (e.g. auto-started by systemd
+    /// when the open5gs-amf package is installed via apt).  Drop is a no-op
+    /// because we did not start this instance.
+    Preexisting,
 }
 
 impl Drop for AmfRuntime {
@@ -73,6 +77,8 @@ impl Drop for AmfRuntime {
                 let _ = child.wait();
             }
             AmfRuntime::Docker => stop_docker_container("exp006-open5gs-amf"),
+            // We did not start this instance — leave it running.
+            AmfRuntime::Preexisting => {}
         }
     }
 }
@@ -472,9 +478,28 @@ fn main() {
             println!("[Step 0] Native open5gs binary detected: {bin}");
             println!("         Config: {cfg_path}");
             let amf_cfg = parse_amf_yaml(cfg_path).expect("AMF YAML must parse");
-            let child = start_native_amf(bin, cfg_path).expect("open5gs-amfd must start");
-            let runtime = AmfRuntime::NativePid(child);
+            let mut child = start_native_amf(bin, cfg_path).expect("open5gs-amfd must start");
+            // Poll for an immediate startup failure (e.g. when the open5gs-amf
+            // systemd service was auto-started by `apt install` and already
+            // holds SBI port 7777 and metrics port 9090).  Check every 100 ms
+            // for up to 1 s so we don't miss a brief startup race.
+            let immediate_exit = (0..10).find_map(|_| {
+                std::thread::sleep(Duration::from_millis(100));
+                child.try_wait().ok().and_then(|s| s)
+            });
             let addr = detect_metrics_addr("").unwrap_or_else(|| "127.0.0.1:9090".to_owned());
+            let runtime = match immediate_exit {
+                Some(status) => {
+                    // Binary exited immediately — a pre-existing instance (started
+                    // by systemd) is already running on this host.  Use it.
+                    println!(
+                        "         Binary exited immediately (status={status}); \
+                         using pre-existing open5gs AMF instance"
+                    );
+                    AmfRuntime::Preexisting
+                }
+                None => AmfRuntime::NativePid(child),
+            };
             (runtime, amf_cfg, addr)
         }
         None => {