CAD-1859 bench: eventlog fixes

input-output-hk · Oct 28, 2020 · 0667739 · 0667739
1 parent 10eb755
commit 0667739
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 13 deletions.
diff --git a/bench/profile-definitions.jq b/bench/profile-definitions.jq
@@ -142,39 +142,54 @@ def aux_profiles:
     , extra_delegators:      500000
     , stuffed_utxo:          500000
     , reuse:                   true
-    , genesis_future_offset: "9 minutes" } }
+    , genesis_future_offset: "9 minutes" }
+  , node:
+    { eventlog:                true
+    } }
 , { name: "k2000-fast"
   , generator: { txs: 10000, add_tx_size: 100, io_arity: 1,  tps: 100 }
   , genesis:
     { dense_pool_density:       200
     , extra_delegators:      500000
     , stuffed_utxo:          500000
     , reuse:                   true
-    , genesis_future_offset: "9 minutes" } }
+    , genesis_future_offset: "9 minutes" }
+  , node:
+    { eventlog:                true
+    } }
 , { name: "k1000"
   , generator: { txs: 22000, add_tx_size: 100, io_arity: 1,  tps: 1 }
   , genesis:
     { dense_pool_density:       100
     , extra_delegators:      500000
     , stuffed_utxo:          500000
     , reuse:                   true
-    , genesis_future_offset: "9 minutes" } }
+    , genesis_future_offset: "9 minutes" }
+  , node:
+    { eventlog:                true
+    } }
 , { name: "k2000"
   , generator: { txs: 22000, add_tx_size: 100, io_arity: 1,  tps: 1 }
   , genesis:
     { dense_pool_density:       200
     , extra_delegators:      500000
     , stuffed_utxo:          500000
     , reuse:                   true
-    , genesis_future_offset: "9 minutes" } }
+    , genesis_future_offset: "9 minutes" }
+  , node:
+    { eventlog:                true
+    } }
 , { name: "k3000"
   , generator: { txs: 22000, add_tx_size: 100, io_arity: 1,  tps: 1 }
   , genesis:
     { dense_pool_density:       300
     , extra_delegators:      500000
     , stuffed_utxo:          500000
     , reuse:                   true
-    , genesis_future_offset: "9 minutes" } }
+    , genesis_future_offset: "9 minutes" }
+  , node:
+    { eventlog:                true
+    } }
 
 , { name: "k1000-fast52"
   , generator: { txs: 10000, add_tx_size: 100, io_arity: 1,  tps: 100 }
@@ -183,15 +198,21 @@ def aux_profiles:
     , extra_delegators:      500000
     , stuffed_utxo:          500000
     , reuse:                   true
-    , genesis_future_offset: "25 minutes" } }
+    , genesis_future_offset: "25 minutes" }
+  , node:
+    { eventlog:                true
+    } }
 , { name: "k1000-52"
   , generator: { txs: 10000, add_tx_size: 100, io_arity: 1,  tps: 1 }
   , genesis:
     { dense_pool_density:        20
     , extra_delegators:      500000
     , stuffed_utxo:          500000
     , reuse:                   true
-    , genesis_future_offset: "25 minutes" } }
+    , genesis_future_offset: "25 minutes" }
+  , node:
+    { eventlog:                true
+    } }
 
 , { name: "k2000-fast52"
   , generator: { txs: 10000, add_tx_size: 100, io_arity: 1,  tps: 100 }
@@ -208,7 +229,10 @@ def aux_profiles:
     , extra_delegators:      500000
     , stuffed_utxo:          500000
     , reuse:                   true
-    , genesis_future_offset: "25 minutes" } }
+    , genesis_future_offset: "25 minutes" }
+  , node:
+    { eventlog:                true
+    } }
 
 , { name: "k3000-fast52"
   , generator: { txs: 10000, add_tx_size: 100, io_arity: 1,  tps: 100 }
@@ -217,13 +241,19 @@ def aux_profiles:
     , extra_delegators:      500000
     , stuffed_utxo:          500000
     , reuse:                   true
-    , genesis_future_offset: "25 minutes" } }
+    , genesis_future_offset: "25 minutes" }
+  , node:
+    { eventlog:                true
+    } }
 , { name: "k3000-52"
   , generator: { txs: 10000, add_tx_size: 100, io_arity: 1,  tps: 1 }
   , genesis:
     { dense_pool_density:        60
     , extra_delegators:      500000
     , stuffed_utxo:          500000
     , reuse:                   true
-    , genesis_future_offset: "25 minutes" } }
+    , genesis_future_offset: "25 minutes" }
+  , node:
+    { eventlog:                true
+    } }
 ];
diff --git a/globals-bench-txgen-simple.nix b/globals-bench-txgen-simple.nix
@@ -58,11 +58,17 @@ let
     else abort "${benchmarkingParamsFile} does not define benchmarking profile '${benchmarkingProfileName}'.";
   rewriteTopologyForProfile =
     topo: prof:
-    let rewriteCore = core: (core //
+    let fixupPools = core: (core //
           { pools = if __hasAttr "pools" core && core.pools != null
                     then (if core.pools == 1 then 1 else prof.genesis.dense_pool_density)
                     else 0; });
-    in (topo // { coreNodes = map rewriteCore topo.coreNodes; });
+        pooledCores = map fixupPools topo.coreNodes;
+    in (topo // {
+      coreNodes =
+        if prof.node.eventlog
+        then map withEventlog pooledCores
+        else pooledCores;
+    });
 
   metadata = {
     inherit benchmarkingProfileName benchmarkingProfile benchmarkingTopology;

diff --git a/nix/cardano.nix b/nix/cardano.nix
@@ -10,6 +10,6 @@ let
 in rec {
   inherit cardano-db-sync-pkgs cardano-explorer-app-pkgs cardano-rest-pkgs cardanoNodePkgs;
   inherit (cardanoNodePkgs.cardanoNodeHaskellPackages.cardano-cli.components.exes) cardano-cli;
-  inherit (cardanoNodePkgs.cardanoNodeEventlogHaskellPackages.cardano-node.components.exes) cardano-node;
+  inherit (cardanoNodePkgs.cardanoNodeHaskellPackages.cardano-node.components.exes) cardano-node;
   inherit (cardano-rosetta-pkgs) cardano-rosetta-server;
 }
diff --git a/nix/topology-lib.nix b/nix/topology-lib.nix
@@ -21,6 +21,12 @@ pkgs: with pkgs; with lib; rec {
     services.cardano-node.profiling = mkIf (elem def.name nodes) p;
   } def;
 
+  /* Enable eventlog collection for the given list of nodes (first arg).
+  */
+  withEventlog = nodes: def: lib.recursiveUpdate {
+    services.cardano-node.eventlog = true;
+  } def;
+
   /* return the dns name of the continental group of relay
      that is the nearest to the given region.
   */