IS 968

skalenetwork · Oct 16, 2024 · af1a452 · af1a452
1 parent badef22
commit af1a452
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/libskale/SnapshotManager.cpp b/libskale/SnapshotManager.cpp
@@ -353,11 +353,23 @@ void SnapshotManager::leaveNLastSnapshots( unsigned n ) {
     for ( const auto& p : numbers ) {
         if ( i++ > n ) {
             const fs::path& path = p.second;
-            for ( const string& v : allVolumes ) {
+            for ( const string& v : coreVolumes ) {
                 if ( btrfs.subvolume._delete( ( path / v ).c_str() ) ) {
                     throw CannotPerformBtrfsOperation( btrfs.last_cmd(), btrfs.strerror() );
                 }
             }
+
+#ifdef HISTORIC_STATE
+            for ( const string& v : archiveVolumes ) {
+                // ignore as it might indicate that archive volumes weren't snapshotted
+                if ( !fs::exists( path / v ) )
+                    continue;
+                if ( btrfs.subvolume._delete( ( path / v ).c_str() ) ) {
+                    throw CannotPerformBtrfsOperation( btrfs.last_cmd(), btrfs.strerror() );
+                }
+            }
+#endif
+
             fs::remove_all( path );
         }  // if
     }      // for