Address review comments

kaspanet · Oct 25, 2023 · af3a7a8 · af3a7a8
1 parent 25023d5
commit af3a7a8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/components/consensusmanager/src/lib.rs b/components/consensusmanager/src/lib.rs
@@ -210,6 +210,7 @@ impl StagingConsensus {
         for handle in self.handles {
             handle.join().unwrap();
         }
+        drop(self.staging);
         self.manager.delete_staging_entry();
     }
 }

diff --git a/consensus/src/consensus/ctl.rs b/consensus/src/consensus/ctl.rs
@@ -39,8 +39,6 @@ impl ConsensusCtl for Ctl {
     fn make_active(&self) {
         // TODO: pass a value to make sure the correct consensus is committed
         self.management_store.write().commit_staging_consensus().unwrap();
-
-        // TODO: delete previous active
     }
 }
 

diff --git a/consensus/src/consensus/factory.rs b/consensus/src/consensus/factory.rs
@@ -298,6 +298,8 @@ impl ConsensusFactory for Factory {
     }
 
     fn clean_non_active_consensus_entries(&self) {
+        self.delete_staging_entry();
+
         if self.config.is_archival {
             return;
         }
@@ -339,9 +341,7 @@ impl ConsensusFactory for Factory {
                     warn!("Couldn't delete staging consensus entry {}: {}", entry.key, e);
                 }
             };
-        } else {
-            warn!("Couldn't delete staging consensus entry: entry was not found");
+            write_guard.cancel_staging_consensus().unwrap();
         }
-        self.management_store.write().cancel_staging_consensus().unwrap();
     }
 }