Persist zones

crates/api/src/lib.rs

@@ -475,6 +475,7 @@ pub struct LastPublishedZone {
 #[derive(Deserialize, Serialize, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Progress {
     Waiting,
+    Restoring,
     Loading,
     LoadedReview,
     HaltLoaded,

crates/cli/src/commands/zone.rs

@@ -640,7 +640,7 @@ impl Zone {
         // Output information per step progressed until the first still
         // in-progress/aborted step or show all steps if all have completed.
         println!("");
-        print_status(zone.progress, &zone, &policy);
+        print_status(&zone, &policy);
 
         if zone.last_published.is_some() {
             println!("");
@@ -703,8 +703,11 @@ impl Zone {
     }
 }
 
-pub fn print_status(current: Progress, zone: &ZoneStatus, policy: &PolicyInfo) {
-    let progress = match zone.progress {
+pub fn print_status(zone: &ZoneStatus, policy: &PolicyInfo) {
+    let current = zone.progress;
+
+    let progress = match current {
+        Progress::Restoring => "restoring",
         Progress::Waiting => "idle",
         Progress::Loading => "loading",
         Progress::LoadedReview => "waiting for loaded review",
@@ -717,7 +720,7 @@ pub fn print_status(current: Progress, zone: &ZoneStatus, policy: &PolicyInfo) {
 
     println!("status: {}{progress}{}", ansi::BLUE, ansi::RESET);
 
-    if current == Progress::Waiting {
+    if matches!(current, Progress::Waiting | Progress::Restoring) {
         return;
     }
 

crates/zonedata/src/restorer.rs

@@ -197,6 +197,11 @@ impl LoadedZoneRestorer {
             .find(|inst| inst.soa.is_some())
             .map(LoadedZoneReader::new)
     }
+
+    /// The diff from the preceding loaded instance to the current one.
+    pub fn take_diff(&mut self) -> Option<Box<DiffData>> {
+        self.diff.take()
+    }
 }
 
 impl LoadedZoneRestorer {
@@ -424,6 +429,20 @@ impl SignedZoneRestorer {
     pub fn clear(&mut self) {
         // Initialize the absolute data.
 
+        // SAFETY: As per the caller, 'loaded[index]' will not be
+        // accessed elsewhere for the lifetime of 'self', and so is sound to
+        // access mutably.
+        let next = unsafe { &mut *self.data.loaded[self.index as usize].get() };
+        next.soa = None;
+        next.records.clear();
+
+        // SAFETY: As per the caller, 'loaded[!index]' will not be
+        // accessed elsewhere for the lifetime of 'self', and so is sound to
+        // access mutably.
+        let curr = unsafe { &mut *self.data.loaded[!self.index as usize].get() };
+        curr.soa = None;
+        curr.records.clear();
+
         // SAFETY: As per the caller, 'signed[index]' will not be
         // accessed elsewhere for the lifetime of 'self', and so is sound to
         // access mutably.
@@ -469,6 +488,11 @@ impl SignedZoneRestorer {
             .find(|inst| inst.soa.is_some())
             .map(|inst| SignedZoneReader::new(curr_loaded, inst))
     }
+
+    /// The diff from the preceding signed instance to the current one.
+    pub fn take_diff(&mut self) -> Option<Box<DiffData>> {
+        self.diff.take()
+    }
 }
 
 impl SignedZoneRestorer {

crates/zonedata/src/storage/mod.rs

@@ -31,6 +31,32 @@ mod transitions;
 /// reviewed, and switched to. While it requires `&mut` access to be modified,
 /// it is designed to live in a (synchronous) mutex -- expensive operations on
 /// the zone are always achievable without `&mut` access.
+///
+/// ```text
+/// ╔═══════════════════╗ finish  ╔═══════════════════╗ finish  
+/// ║  RestoringLoaded  ╠═════════▶  RestoringSigned  ╠════════╗  
+/// ╚══╤════════════════╝         ╚══╤════════════════╝        ║  
+///    │ abandon                     │ abandon                 ║  
+/// ┌──▼─────────────────────────────▼─────────────────────────▼─────────┐
+/// │                            Passive                                 │
+/// └─────────╥────────────────────────────────────────────────────────▲─┘
+///           ║                                                        │ mark_complete
+/// ┌─────────║──────────────────────────────────────────────────────────┐               ╔═════════════╗   start   ╔════════════════════╗                               approve                                                         
+/// │         ║                  Cleaning                                <═══════════════║  Switching  <═══════════║  PersistingSigned  <═══════════════════════════════════════════════════════════════════▲
+/// └─────────║──────▲─────────────────────────────────────────────────▲─┘               ╚═════════════╝           ╚════════════════════╝                                                                   ║                                                
+///           ║      │                                                 │  stop_review                                                                                                                       ║
+///           ║      │                                            ┌─────────────────────┐       stop_review        ┌────────────────────┐                     give_up                                       ║                                                                                                                     
+///      load ║      │ give_up                                    │  CleanLoadedPending <──────────────────────────│  CleanWholePending <─────────────────────────────────────────────────────┐             ║                                                                                                                                         
+///           ║      │                                            └────▲────────────────┘                          └────────────────────┘                                                     │             ║                                                                                                                     
+///           ▼      │                                                 │ give_up                                                                                                              │             ║
+///        ╔═════════╧═╗ finish ╔══════════════════════════╗ start ╔═══════════════════╗ approve ╔════════════════════╗ complete ╔══▼═════════════╗ finish ╔═══════════════════════╗ start ╔══════════════════╗
+///        ║  Loading  ╠════════▶  ReviewingLoadedPending  ╠═══════▶  ReviewingLoaded  ╠═════════▶  PersistingLoaded  ╠══════════▶    Signing     ╠════════▶  ReviewSignedPending  ╠═══════▶  ReviewingSigned ║
+///        ╚═══════════╝        ╚══════════════════════════╝       ╚═══════════════════╝         ╚════════════════════╝          ╚══╤═════════▲═══╝        ╚═══════════════════════╝       ╚════════╤═════════╝
+///                                                                                                                           retry │         │ complete                                      retry │
+///                                                                                                                              ┌──▼─────────┴────┐              stop_review            ┌──────────▼──────────┐
+///                                                                                                                              │  CleaningSigned <─────────────────────────────────────│  CleanSignedPending │
+///                                                                                                                              └─────────────────┘                                     └─────────────────────┘
+/// ```
 pub enum ZoneDataStorage {
     /// The loaded instance of the zone is being restored.
     RestoringLoaded(RestoringLoadedStorage),

crates/zonedata/src/storage/transitions.rs

@@ -138,20 +138,19 @@ impl RestoringSignedStorage {
         LoadedZoneReviewer,
         SignedZoneReviewer,
         ZoneViewer,
-        SignedZoneBuilder,
-        SigningStorage,
+        PassiveStorage,
     ) {
         assert!(
             Arc::ptr_eq(restorer.data(), &self.data),
             "'restorer' is for a different zone"
         );
 
         restorer.clear();
-
         let Self {
             data,
-            curr_loaded_index,
+            curr_loaded_index: _,
         } = self;
+        let curr_loaded_index = false;
         let curr_signed_index = false;
 
         let loaded_reviewer =
@@ -166,18 +165,14 @@ impl RestoringSignedStorage {
             )
         };
         let viewer = unsafe { ZoneViewer::new(data.clone(), curr_loaded_index, curr_signed_index) };
-        let builder = unsafe {
-            SignedZoneBuilder::new(data.clone(), curr_loaded_index, !curr_signed_index, None)
-        };
 
-        let storage = SigningStorage {
+        let storage = PassiveStorage {
             data,
             curr_loaded_index,
             curr_signed_index,
-            loaded_diff: None,
         };
 
-        (loaded_reviewer, signed_reviewer, viewer, builder, storage)
+        (loaded_reviewer, signed_reviewer, viewer, storage)
     }
 }
 

integration-tests/system-tests.yml

@@ -301,3 +301,18 @@ jobs:
           accept-xfr-from: ${{ matrix.accept-xfr-from }}
           downstream-expects-tsig: ${{ matrix.downstream-expects-tsig }}
           downstream-uses-tsig: ${{ matrix.downstream-uses-tsig }}
+
+  persist-zone:
+    name: Added zone should still exist after restart.
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust: [stable]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/set-build-profile
+        with:
+          build-profile: ${{ inputs.build-profile }}
+      - uses: ./integration-tests/tests/persist-zone
+        with:
+          log-level: ${{ inputs.log-level }}