Merge #2576

2576: Fix nightly benchmarks r=Anviking a=rvl ### Issue Number ADP-804 ### Overview Nightly restore bench is still failing. 1. Restore bench: Increase cardano-node startup time allowance If the cardano-node database is shared between bench runs, it may need to rebuild the ledger, etc, at startup. So increase the time available for that. 2. Latency bench: Fix working directory The meaning of `$src` seems to have changed since the Haskell.nix bump in PR #2533. 3. DB Bench: I broke the criterion env setup - fixed now. Co-authored-by: Rodney Lorrimar <[email protected]>
cardano-foundation · Mar 28, 2021 · 71fb59d · 71fb59d
2 parents 404fd3b + 9b5d1d9
commit 71fb59d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/lib/core/test/bench/db/Main.hs b/lib/core/test/bench/db/Main.hs
@@ -659,16 +659,17 @@ withDB
     => Tracer IO WalletDBLog
     -> (DBLayer IO s k -> Benchmark)
     -> Benchmark
-withDB tr bm = envWithCleanup (setupDB tr) cleanupDB (\(BenchEnv _ _ db) -> bm db)
+withDB tr bm = envWithCleanup (setupDB tr) cleanupDB $
+    \benchEnv -> bm (dbLayer benchEnv)
 
 data BenchEnv s k = BenchEnv
     { cleanupDB :: IO ()
-    , _dbFile :: FilePath
-    , _dbLayer :: !(DBLayer IO s k)
+    , dbFile :: FilePath
+    , dbLayer :: DBLayer IO s k
     }
 
 instance NFData (BenchEnv s k) where
-    rnf (BenchEnv _ fp db) = deepseq (rnf fp) $ deepseq (rnf db) ()
+    rnf env = deepseq (rnf $ dbFile env) $ deepseq (rnf $ dbLayer env) ()
 
 withTempSqliteFile :: (FilePath -> IO a) -> IO a
 withTempSqliteFile action = withSystemTempFile "bench.db" $ \fp _ -> action fp

diff --git a/lib/shelley/bench/Restore.hs b/lib/shelley/bench/Restore.hs
@@ -764,7 +764,7 @@ waitForNodeSync
     => Tracer IO (BenchmarkLog n)
     -> NetworkLayer IO Block
     -> IO SlotNo
-waitForNodeSync tr nw = loop 10
+waitForNodeSync tr nw = loop 120 -- allow 30 minutes for first tip
   where
     loop :: Int -> IO SlotNo
     loop retries = do
@@ -788,7 +788,7 @@ waitForNodeSync tr nw = loop 10
                  traceWith tr $ MsgRetryShortly delay
                  threadDelay delay
                  loop (retries - 1)
-            else throwString "Gave up waitForNodeSync"
+            else throwString "Gave up in waitForNodeSync, waiting a tip"
 
 data BenchmarkLog (n :: NetworkDiscriminant)
     = MsgNodeTipTick BlockHeader SyncProgress

diff --git a/nix/haskell.nix b/nix/haskell.nix
@@ -135,8 +135,17 @@ let
           unit.postInstall = libSodiumPostInstall;
         };
 
-        # Add node backend to the PATH of the latency benchmarks
-        packages.cardano-wallet.components.benchmarks.latency = wrapBench cardanoNodeExes;
+        # Add node backend to the PATH of the latency benchmarks, and
+        # set the source tree as its working directory.
+        packages.cardano-wallet.components.benchmarks.latency =
+          lib.optionalAttrs (!stdenv.hostPlatform.isWindows) {
+            build-tools = [ pkgs.makeWrapper ];
+            postInstall = ''
+              wrapProgram $out/bin/* \
+                --run "cd $src/lib/shelley" \
+                --prefix PATH : ${lib.makeBinPath cardanoNodeExes}
+            '';
+          };
 
         # Add cardano-node to the PATH of the byroon restore benchmark.
         # cardano-node will want to write logs to a subdirectory of the working directory.
@@ -325,19 +334,6 @@ let
     "$out/bin/$exeName" --fish-completion-script "$out/bin/$exeName" >"$fishCompDir/$exeName.fish"
   '';
 
-  # Add component options to wrap a benchmark exe, so that it has the
-  # backend executable on its path, and the source tree as its working
-  # directory.
-  wrapBench = progs:
-    lib.optionalAttrs (!stdenv.hostPlatform.isWindows) {
-      build-tools = [ pkgs.makeWrapper ];
-      postInstall = ''
-        wrapProgram $out/bin/* \
-          --run "cd $src" \
-          --prefix PATH : ${lib.makeBinPath progs}
-      '';
-    };
-
 in
   haskell.addProjectAndPackageAttrs {
     inherit pkg-set;