Read snapshot interval from main toplevel config too

IntersectMBO · Jan 30, 2025 · 5c8fc00 · 5c8fc00
1 parent 1d5598d
commit 5c8fc00
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/cardano-node/src/Cardano/Node/Configuration/POM.hs b/cardano-node/src/Cardano/Node/Configuration/POM.hs
@@ -436,9 +436,14 @@ instance FromJSON PartialNodeConfiguration where
                    (fmap RequestedNumOfDiskSnapshots <$> o .:? "NumOfDiskSnapshots")
                .!= DefaultNumOfDiskSnapshots
              doChecksum <- (fmap Flag <$> o .:? "DoDiskSnapshotChecksum") .!= DoDiskSnapshotChecksum
-             snapInterval <-
-                   (fmap (RequestedSnapshotInterval . secondsToDiffTime) <$> o .:? "SnapshotInterval")
-               .!= DefaultSnapshotInterval
+             snapInterval <- do
+                   ov <- (fmap (RequestedSnapshotInterval . secondsToDiffTime) <$> o .:? "SnapshotInterval") .!= DefaultSnapshotInterval
+                   case ov of
+                      DefaultSnapshotInterval -> do
+                         -- This is here just to ensure that we also try to read the SnapshotInterval from the toplevel config. as it was the case before UTxO-HD
+                         -- It is needed for the pre-emptive cluster runs
+                         (fmap (RequestedSnapshotInterval . secondsToDiffTime) <$> v .:? "SnapshotInterval") .!= DefaultSnapshotInterval
+                      _ -> pure ov
              qsize <-
                    (fmap RequestedQueryBatchSize <$> o .:? "QueryBatchSize")
                .!= DefaultQueryBatchSize