huskies: merge 719_refactor_stale_merge_job_lock_recovery_on_new_merge_attempts

2026-04-27 17:41:39 +00:00
parent 1ecb4dad55
commit 101f616346
2 changed files with 116 additions and 1 deletions
@@ -20,6 +20,12 @@ pub enum MergeJobStatus {
 pub struct MergeJob {
    pub story_id: String,
    pub status: MergeJobStatus,
+    /// PID of the server process that started this job.
+    ///
+    /// Used by stale-lock recovery: on a new merge attempt the system checks
+    /// every Running entry and removes any whose owning process is no longer
+    /// alive (e.g. the server crashed and restarted).
+    pub pid: u32,
 }

 /// Result of a mergemaster merge operation.