Make merging happen on configurator thread

2026-05-30 19:40:39 +00:00 · 2023-11-16 20:52:46 +01:00
parent d19860abf7
commit a5d0f1a92e
6 changed files with 79 additions and 13 deletions
--- a/libs/compute_api/src/responses.rs
+++ b/libs/compute_api/src/responses.rs
@@ -48,6 +48,10 @@ pub enum ComputeStatus {
    Running,
    // New spec is being applied.
    Configuration,
+    // Merge requested
+    MergePending,
+    // Merge in progress
+    Merging,
    // Either startup or configuration failed,
    // compute will exit soon or is waiting for
    // control-plane to terminate it.