CAD-2069 node & benchmarking: bump & add locli

input-output-hk · Oct 20, 2020 · e4762a9 · e4762a9
1 parent 335668b
commit e4762a9
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 18 deletions.
diff --git a/bench/bench.sh b/bench/bench.sh
@@ -125,7 +125,8 @@ main() {
         do case "$1" in
            --fast-unsafe | --fu ) no_deploy=t no_wait=t;;
            --deploy )             force_deploy=t;;
-           --reuse-genesis )      reuse_genesis=t;;
+           --reuse-genesis | --keep-genesis )
+                                  reuse_genesis=t;;
            --watch | --watch-deploy )
                                   watch_deploy=t;;
            --select )             jq_select="jq 'select ($2)'"; shift;;

diff --git a/bench/lib-analyses.sh b/bench/lib-analyses.sh
@@ -238,18 +238,31 @@ analysis_tx_losses() {
         popd >/dev/null || return 1
 }
 
-# for n in analysis/logs-node-*; do echo "node: $n ------------------"; for slot in $(seq 0 1987); do checks=$(grep -H 'TraceStartLeadershipCheck.*:'$slot',' $n/* | wc -l); if test "$checks" != 100; then echo "@slot $slot: leadership check count != 100, but $checks"; fi; done; done
-analysis_list+=()
-analysis_dense_leadership() {
+analysis_list+=(analysis_leadership_checks)
+analysis_leadership_checks() {
         local dir=${1:-.}; shift
-        local machines=("$@")
+        local machines=("$@") keyfile leadership_analysis_args prof
+        prof=$(jq '.meta.profile' "$dir"/meta.json --raw-output)
+
+        leadership_analysis_args=(
+                analyse leadership
+                --slot-length  "$(profjq "$prof" .genesis.slot_duration)"
+                --system-start "$(jq .systemStart "$dir"/genesis.json -r)"
+        )
 
-        for n in analysis/logs-node-*
-        do echo "node: $n ------------------"
-           for slot in $(seq 0 1987)
-           do echo -n " $slot:$(grep -H 'TraceStartLeadershipCheck.*:'$slot',' $n/* | wc -l)"
-           done
+        keyfile=$(mktemp -t XXXXXXXXXX.keys)
+        locli analyse substring-keys > "$keyfile"
+
+        for mach in ${machines[*]}
+        do grep -hFf "$keyfile" "$dir"/analysis/logs-"$mach"/*.json > "$dir"/analysis/logs-"$mach".json
+           locli ${leadership_analysis_args[*]} \
+                 --dump-leaderships "$dir"/analysis/logs-"$mach".leaderships.json \
+                 --dump-pretty-timeline "$dir"/analysis/logs-"$mach".leaderships.pretty.json \
+                 > "$dir"/analysis/logs-"$mach".leadership-analysis.json \
+                 "$dir"/analysis/logs-"$mach".json
         done
+
+        rm -f "$keyfile"
 }
 
 analysis_list+=(analysis_derived)

diff --git a/bench/profile-definitions.jq b/bench/profile-definitions.jq
@@ -108,7 +108,7 @@ def era_generator_profiles($era):
 def era_tolerances($era; $genesis):
 { common:
   { tx_loss_ratio:                  0.0
-  , start_log_spread_s:             60
+  , start_log_spread_s:             120
   , last_log_spread_s:              60
   , slot_spread_dbsync_first:       5
   , slot_spread_dbsync_last:        5

diff --git a/nix/benchmarking.nix b/nix/benchmarking.nix
@@ -4,5 +4,5 @@ let
     gitrev = self.sourcePaths.cardano-benchmarking.rev;
   };
 in {
-  inherit (cardano-benchmarking-pkgs.haskellPackages) cardano-tx-generator;
+  inherit (cardano-benchmarking-pkgs.haskellPackages) cardano-tx-generator locli;
 }
diff --git a/nix/sources.bench-txgen-simple.json b/nix/sources.bench-txgen-simple.json
@@ -17,10 +17,10 @@
          "homepage": null,
          "owner": "input-output-hk",
          "repo": "cardano-node",
-        "rev": "2405acb194b61691379b55d0f3e9e69c8d5b8476",
-        "sha256": "1g7apl46cmzgqncbsvxl316qaj012036gd485wkhnavzv22mf0vb",
+         "rev": "78e0e100bf7eeeb5dc2d8a236a0e518a5474b7ed",
+         "sha256": "1vi0ig2nsg3fykf1qxd5anwi55ay2cr14a8kd17ljifdjf060ar0",
          "type": "tarball",
-         "url": "https://github.com/input-output-hk/cardano-node/archive/2405acb194b61691379b55d0f3e9e69c8d5b8476.tar.gz",
+         "url": "https://github.com/input-output-hk/cardano-node/archive/78e0e100bf7eeeb5dc2d8a236a0e518a5474b7ed.tar.gz",
          "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
      }
 }
diff --git a/nix/sources.json b/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-benchmarking",
-        "rev": "e89c2f94d16f57f7a2a152e9b1916e177ba41d22",
-        "sha256": "0478vrzv5h99ggqlk1j2zvnmr04vv76cchyabk6mb52vs9qkk9sa",
+        "rev": "91c47fa49c79a11b24bb09574fcdf3adde4f9fcf",
+        "sha256": "0gk2kr239jgiqkaxy7snlz2i07agckx147psdca0byfbbx6dly19",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-benchmarking/archive/e89c2f94d16f57f7a2a152e9b1916e177ba41d22.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-benchmarking/archive/91c47fa49c79a11b24bb09574fcdf3adde4f9fcf.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-db-sync": {

diff --git a/shell.nix b/shell.nix
@@ -51,6 +51,7 @@ in  mkShell {
     cardano-cli
     dnsutils
     iohkNix.niv
+    locli.components.exes.locli
     nivOverrides
     nix
     nix-diff