Struggling with E2E test

Author: abailly

mithril-aggregator/src/runtime.rs

@@ -2,7 +2,7 @@ use crate::dependency::BeaconStoreWrapper;
 use crate::Snapshotter;
 use mithril_common::fake_data;
 use mithril_common::immutable_digester::ImmutableDigester;
-use slog_scope::{error, info};
+use slog_scope::{debug, error, info};
 use tokio::time::{sleep, Duration};
 
 /// AggregatorRuntime
@@ -46,6 +46,7 @@ impl AggregatorRuntime {
     async fn do_work(&self) -> Result<(), String> {
         let snapshotter = Snapshotter::new(self.db_directory.clone());
         let digester = ImmutableDigester::new(self.db_directory.clone(), slog_scope::logger());
+        debug!("Making snapshot"; "directory" => &self.db_directory);
 
         match digester.compute_digest() {
             Ok(digest_result) => {

mithril-common/src/immutable_digester.rs

@@ -98,7 +98,7 @@ struct Progress {
 impl Progress {
     fn report(&mut self, ix: usize) -> bool {
         self.index = ix;
-        ix % (self.total / 20) == 0
+        (20 * ix) % self.total == 0
     }
 
     fn percent(&self) -> f64 {
@@ -195,6 +195,8 @@ mod tests {
         }
     }
 
+    // TODO: Test the case where number of immutable files is lower than 20
+
     #[test]
     fn reports_progress_every_5_percent() {
         let mut progress = Progress {

mithril-test-lab/mithril-end-to-end/config/cardano-node.json

@@ -14,7 +14,7 @@
 
   "RequiresNetworkMagic": "RequiresNoMagic",
 
-  "minSeverity": "Info",
+  "minSeverity": "Trace",
   "defaultBackends": ["KatipBK"],
   "defaultScribes": [[ "StdoutSK", "stdout" ]],
   "setupBackends": ["KatipBK"],
@@ -30,7 +30,7 @@
   "TurnOnLogMetrics": true,
   "TurnOnLogging": true,
 
-  "TracingVerbosity": "NormalVerbosity",
+  "TracingVerbosity": "MaximalVerbosity",
   "TraceBlockFetchClient": false,
   "TraceBlockFetchDecisions": false,
   "TraceBlockFetchProtocol": false,

mithril-test-lab/mithril-end-to-end/config/genesis-shelley.json

@@ -54,5 +54,5 @@
     "slotsPerKESPeriod": 129600,
     "slotLength": 0.1,
     "maxKESEvolutions": 60,
-    "securityParam": 2160
+    "securityParam": 21
 }

mithril-test-lab/mithril-end-to-end/mithril-end-to-end.cabal

@@ -180,6 +180,7 @@ test-suite integration
     , cardano-ledger-shelley-ma
     , containers
     , contra-tracer
+    , directory
     , filepath
     , hedgehog-quickcheck
     , hspec

mithril-test-lab/mithril-end-to-end/src/Mithril/Aggregator.hs

@@ -100,4 +100,4 @@ aggregatorProcess cwd port = do
           ]
             <> baseEnv
   unlessM (doesFileExist aggregator) $ failure $ "cannot find mithril-aggregator executable in expected location (" <> binDir <> ")"
-  pure $ (proc aggregator ["--server-port", show port, "-vvv"]) {cwd, env}
+  pure $ (proc aggregator ["--db-directory", "db", "--server-port", show port, "-vvv"]) {cwd, env}

mithril-test-lab/mithril-end-to-end/test/Test/EndToEndSpec.hs

@@ -28,6 +28,8 @@ import Mithril.Aggregator
 import Mithril.Client (runClient)
 import Mithril.Signer (Signer, withSigner)
 import Network.HTTP.Simple (getResponseBody, getResponseStatusCode, httpJSON, httpLBS, parseRequest)
+import System.Directory (listDirectory)
+import System.FilePath (takeDirectory, takeExtension, (</>))
 import Test.Hydra.Prelude
 
 spec :: Spec
@@ -40,20 +42,22 @@ spec =
                 { parentStateDirectory = tmp,
                   networkId = defaultNetworkId
                 }
-        -- Start aggregator service on some random port
-        withAggregator tmp (contramap AggregatorLog tr) $ \aggregator@Aggregator {aggregatorPort} -> do
-          -- Start cardano nodes cluster
-          withCluster tr config $
-            \cluster -> do
-              -- basic verification, we check the nodes are producing blocks
-              assertNetworkIsProducingBlock tr cluster
-              case cluster of
-                RunningCluster {clusterNodes = node : _} -> do
+        -- Start cardano nodes cluster
+        withCluster tr config $
+          \cluster -> do
+            -- basic verification, we check the nodes are producing blocks
+            assertNetworkIsProducingBlock tr cluster
+            case cluster of
+              RunningCluster {clusterNodes = node@(RunningNode _ nodeSocket) : _} -> do
+                waitForDBToBePopulated (takeDirectory nodeSocket)
+                -- Start aggregator service on some random port
+                withAggregator (takeDirectory nodeSocket) (contramap AggregatorLog tr) $ \aggregator@Aggregator {aggregatorPort} -> do
+                  threadDelay 2
                   digest <- assertNodeIsProducingSnapshot tr node aggregatorPort
                   withSigner tmp (contramap SignerLog tr) aggregatorPort node $ \signer -> do
                     assertSignerIsSigningSnapshot signer aggregatorPort digest
                     assertClientCanVerifySnapshot tmp aggregator digest
-                _ -> failure "No nodes in the cluster"
+              _ -> failure "No nodes in the cluster"
 
 newtype Snapshots = Snapshots [Value]
   deriving newtype (FromJSON)
@@ -112,6 +116,15 @@ assertNetworkIsProducingBlock tracer = failAfter 30 . go (-1)
 waitForNewBlock :: IO ()
 waitForNewBlock = threadDelay (2 * slotLength)
 
+waitForDBToBePopulated :: FilePath -> IO ()
+waitForDBToBePopulated nodeDirectory = do
+  let immutableDir = nodeDirectory </> "db" </> "immutable"
+      isChunk = ((== ".chunk") . takeExtension)
+  immutableFiles <- filter isChunk <$> listDirectory immutableDir
+  when (length immutableFiles < 2) $ do
+    putStrLn $ "waiting for immutable directory " <> immutableDir <> " to have at least 2 chunk files"
+    threadDelay 1 >> waitForDBToBePopulated nodeDirectory
+
 slotLength :: DiffTime
 slotLength = 1 -- FIXME this should be found in the genesis file