wb | profile cluster property only in cloud profiles

Author: fmaste

bench/cardano-profile/data/all-profiles-coay.json

@@ -283,6 +283,7 @@
     "heap_limit": null,
     "shutdown_on_slot_synced": 38901589,
     "shutdown_on_block_synced": null,
+    "ssd_directory": null,
     "tracing_backend": "trace-dispatcher",
     "tracer": false,
     "utxo_lmdb": false,
@@ -306,39 +307,7 @@
     "ekg": false,
     "withresources": false
   },
-  "cluster": {
-    "nomad": {
-      "namespace": "default",
-      "class": "",
-      "resources": {
-        "producer": {
-          "cores": 2,
-          "memory": 15000,
-          "memory_max": 16000
-        },
-        "explorer": {
-          "cores": 2,
-          "memory": 15000,
-          "memory_max": 16000
-        }
-      },
-      "host_volumes": null,
-      "fetch_logs_ssh": false
-    },
-    "aws": {
-      "instance_type": {
-        "producer": "c5.2xlarge",
-        "explorer": "m5.4xlarge"
-      },
-      "use_public_routing": false
-    },
-    "minimun_storage": {
-      "producer": 12582912,
-      "explorer": 14155776
-    },
-    "keep_running": false,
-    "ssd_directory": null
-  },
+  "cluster": null,
   "extra_desc": "without cardano-tracer",
   "suffix": "notrc",
   "desc": "Mainnet chain syncing benchmark",

bench/cardano-profile/data/test/chainsync-early-alonzo-coay/profile.json

@@ -283,6 +283,7 @@
     "heap_limit": null,
     "shutdown_on_slot_synced": 237599,
     "shutdown_on_block_synced": null,
+    "ssd_directory": null,
     "tracing_backend": "trace-dispatcher",
     "tracer": false,
     "utxo_lmdb": false,
@@ -336,8 +337,7 @@
       "producer": 12582912,
       "explorer": 14155776
     },
-    "keep_running": false,
-    "ssd_directory": null
+    "keep_running": false
   },
   "extra_desc": "without cardano-tracer",
   "suffix": "notrc",

bench/cardano-profile/data/test/chainsync-early-byron-coay/profile.json

@@ -313,39 +313,7 @@
     "ekg": false,
     "withresources": false
   },
-  "cluster": {
-    "nomad": {
-      "namespace": "default",
-      "class": "",
-      "resources": {
-        "producer": {
-          "cores": 2,
-          "memory": 15000,
-          "memory_max": 16000
-        },
-        "explorer": {
-          "cores": 2,
-          "memory": 15000,
-          "memory_max": 16000
-        }
-      },
-      "host_volumes": null,
-      "fetch_logs_ssh": false
-    },
-    "aws": {
-      "instance_type": {
-        "producer": "c5.2xlarge",
-        "explorer": "m5.4xlarge"
-      },
-      "use_public_routing": false
-    },
-    "minimun_storage": {
-      "producer": 12582912,
-      "explorer": 14155776
-    },
-    "keep_running": false,
-    "ssd_directory": null
-  },
+  "cluster": null,
   "desc": "Miniature dataset, CI-friendly duration, test scale",
   "name": "ci-test-bage",
   "overlay": {},

bench/cardano-profile/data/test/ci-test-bage.json

@@ -282,6 +282,7 @@
     "heap_limit": null,
     "shutdown_on_slot_synced": null,
     "shutdown_on_block_synced": 3,
+    "ssd_directory": null,
     "tracing_backend": "trace-dispatcher",
     "tracer": true,
     "utxo_lmdb": false,
@@ -313,39 +314,7 @@
     "ekg": false,
     "withresources": false
   },
-  "cluster": {
-    "nomad": {
-      "namespace": "default",
-      "class": "",
-      "resources": {
-        "producer": {
-          "cores": 2,
-          "memory": 15000,
-          "memory_max": 16000
-        },
-        "explorer": {
-          "cores": 2,
-          "memory": 15000,
-          "memory_max": 16000
-        }
-      },
-      "host_volumes": null,
-      "fetch_logs_ssh": false
-    },
-    "aws": {
-      "instance_type": {
-        "producer": "c5.2xlarge",
-        "explorer": "m5.4xlarge"
-      },
-      "use_public_routing": false
-    },
-    "minimun_storage": {
-      "producer": 12582912,
-      "explorer": 14155776
-    },
-    "keep_running": false,
-    "ssd_directory": null
-  },
+  "cluster": null,
   "desc": "Miniature dataset, CI-friendly duration, test scale",
   "name": "ci-test-coay",
   "overlay": {},

bench/cardano-profile/data/test/ci-test-coay/profile.json

@@ -282,6 +282,7 @@
     "heap_limit": null,
     "shutdown_on_slot_synced": null,
     "shutdown_on_block_synced": 3,
+    "ssd_directory": null,
     "tracing_backend": "trace-dispatcher",
     "tracer": true,
     "utxo_lmdb": false,
@@ -313,39 +314,7 @@
     "ekg": false,
     "withresources": false
   },
-  "cluster": {
-    "nomad": {
-      "namespace": "default",
-      "class": "",
-      "resources": {
-        "producer": {
-          "cores": 2,
-          "memory": 15000,
-          "memory_max": 16000
-        },
-        "explorer": {
-          "cores": 2,
-          "memory": 15000,
-          "memory_max": 16000
-        }
-      },
-      "host_volumes": null,
-      "fetch_logs_ssh": false
-    },
-    "aws": {
-      "instance_type": {
-        "producer": "c5.2xlarge",
-        "explorer": "m5.4xlarge"
-      },
-      "use_public_routing": false
-    },
-    "minimun_storage": {
-      "producer": 12582912,
-      "explorer": 14155776
-    },
-    "keep_running": false,
-    "ssd_directory": null
-  },
+  "cluster": null,
   "desc": "Miniature dataset, CI-friendly duration, test scale",
   "name": "ci-test-dense10-coay",
   "overlay": {},

bench/cardano-profile/data/test/ci-test-dense10-coay/profile.json

@@ -282,6 +282,7 @@
     "heap_limit": null,
     "shutdown_on_slot_synced": null,
     "shutdown_on_block_synced": null,
+    "ssd_directory": null,
     "tracing_backend": "trace-dispatcher",
     "tracer": true,
     "utxo_lmdb": false,
@@ -315,39 +316,7 @@
     "ekg": false,
     "withresources": false
   },
-  "cluster": {
-    "nomad": {
-      "namespace": "default",
-      "class": "",
-      "resources": {
-        "producer": {
-          "cores": 2,
-          "memory": 15000,
-          "memory_max": 16000
-        },
-        "explorer": {
-          "cores": 2,
-          "memory": 15000,
-          "memory_max": 16000
-        }
-      },
-      "host_volumes": null,
-      "fetch_logs_ssh": false
-    },
-    "aws": {
-      "instance_type": {
-        "producer": "c5.2xlarge",
-        "explorer": "m5.4xlarge"
-      },
-      "use_public_routing": false
-    },
-    "minimun_storage": {
-      "producer": 12582912,
-      "explorer": 14155776
-    },
-    "keep_running": false,
-    "ssd_directory": null
-  },
+  "cluster": null,
   "name": "default-coay",
   "desc": "Default, as per nix/workbench/profile/prof0-defaults.jq",
   "overlay": {},

bench/cardano-profile/data/test/default-coay/profile.json

@@ -477,6 +477,7 @@
     "heap_limit": null,
     "shutdown_on_slot_synced": null,
     "shutdown_on_block_synced": 1,
+    "ssd_directory": null,
     "tracing_backend": "trace-dispatcher",
     "tracer": true,
     "utxo_lmdb": false,
@@ -540,8 +541,7 @@
       "producer": 12582912,
       "explorer": 14155776
     },
-    "keep_running": true,
-    "ssd_directory": null
+    "keep_running": true
   },
   "desc": "Stop as soon as we've seen a single block",
   "extra_desc": "with P2P networking",

bench/cardano-profile/data/test/fast-nomadperf-coay/profile.json

@@ -114,7 +114,6 @@ profilesNoEraEmpty = map baseNoDataset
   let fast =
           P.empty & V.datasetEmpty . genesis . fastDuration
         . P.uniCircle . P.loopback
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
       fast1 = fast & V.hosts 1
       fast2 = fast & V.hosts 2
   in [
@@ -134,7 +133,6 @@ profilesNoEraEmpty = map baseNoDataset
   let ciTest =
           P.empty & V.datasetEmpty . genesis . ciTestDuration
         . P.uniCircle . V.hosts 2 . P.loopback
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
   in [
   -- Local
     ciTest & P.name "ci-test"          . V.valueLocal . P.traceForwardingOn  . P.newTracing . P.p2pOff
@@ -152,7 +150,6 @@ profilesNoEraEmpty = map baseNoDataset
           P.empty & V.datasetEmpty . V.genesisVariantPreVoltaire . ciTestDuration
         . P.uniCircle . V.hosts 2 . P.loopback
         . P.analysisSizeSmall
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
   in [
      -- intricacies of fee calculation..., default fee works for ci-test-plutus and ci-bench-plutus
     ciTestHydra & P.name "ci-test-hydra" . P.txFeeOverwrite 1380000 . V.plutusLoop . P.traceForwardingOn  . P.newTracing . P.p2pOn . P.blocksize64k
@@ -166,7 +163,6 @@ profilesNoEraEmpty = map baseNoDataset
         -- TODO: "default-*" uses 6 nodes and `uniCircle`.
         . P.torus . V.hosts 6 . P.loopback
         . P.tracerWithresources
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
       bench = trace & traceBenchDuration
       full  = trace & traceFullDuration
   in [
@@ -190,7 +186,6 @@ profilesNoEraEmpty = map baseNoDataset
         -- TODO: The only one without 0 delegators.
         --       Fix and remove `baseNoDataset` (Same `base` for all).
         . P.utxo 0 . P.delegators 6 . P.dreps 0
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
       value  = noCliStop & V.genesisVariant300
       -- TODO: "fast-plutus" and "ci-test-plutus" are using `genesisVariant300`.
       plutus = noCliStop & V.genesisVariantPreVoltaire
@@ -214,7 +209,6 @@ profilesNoEraEmpty = map baseNoDataset
   let ep =
           P.empty & V.datasetEmpty . genesis . epochTransitionDuration
         . P.uniCircle . V.hosts 2 . P.loopback
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
   in [
     ep & P.name "epoch-transition" . V.valueLocal . P.traceForwardingOn . P.newTracing . P.p2pOff
   ]

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Empty.hs

@@ -29,7 +29,6 @@ base =
   . P.p2pOff . P.newTracing
   . P.initCooldown 5
   . P.analysisStandard
-  . V.clusterDefault -- TODO: "cluster" should be "null" here.
 
 -- Helpers by timescale:
 

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/ForgeStress.hs

@@ -35,7 +35,6 @@ profilesNoEraK3 =
         . P.p2pOff
         . P.traceForwardingOn . P.newTracing
         . P.analysisStandard . P.analysisUnitary
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
   in [
     k3 & P.name "k3-3ep-5kTx-10000kU-1300kD-64kbs-fixed-loaded"        . V.valueBase . P.slotDuration 0.2 . P.tps 12
   , k3 & P.name "k3-3ep-9kTx-10000kU-1300kD-64kbs-5tps-fixed-loaded"   . V.valueBase . P.slotDuration 1   . P.tps  5

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/K3.hs

@@ -29,7 +29,6 @@ profilesNoEraDense =
         . V.genesisVariant300
         . E.ciTestDuration
         . P.cBlockMinimumAdoptions 9
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
   in [
     ciTestDense & P.name "ci-test-dense10" . V.valueLocal . P.traceForwardingOn . P.newTracing . P.p2pOff
   ]

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Legacy/Dense.hs

@@ -64,7 +64,6 @@ profilesNoEraMiniature =
         . P.desc "Miniature dataset, CI-friendly duration, bench scale"
         . P.uniCircle . P.loopback
         . benchDuration
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
       -- Helpers by size:
       ciBench02  = ciBench & V.hosts  2
       ciBench10  = ciBench & V.hosts 10
@@ -114,7 +113,6 @@ profilesNoEraMiniature =
         . P.dreps 0
         . P.p2pOn
         . P.analysisSizeFull . P.analysisUnitary
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
   in [
     dense & P.name "6-dense"            . V.valueCloud . duration30  . P.traceForwardingOn . P.newTracing
   , dense & P.name "6-dense-rtsprof"    . V.valueCloud . duration30  . P.traceForwardingOn . P.newTracing . P.rtsHeapProf . P.rtsEventlogged

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Miniature.hs

@@ -40,7 +40,6 @@ profilesNoEraModel =
         . V.fundsDouble
         . P.traceForwardingOn . P.newTracing
         . P.analysisStandard . P.analysisEpoch3Plus
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
         . P.desc "Status-quo dataset, 7 epochs"
       secp       = V.plutusDoubleSaturation . V.plutusTypeECDSA . P.analysisSizeModerate
       value      = V.valueBase . P.tps 9 -- "value" with the Plutus `txFee`.

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Model.hs

@@ -43,7 +43,6 @@ profilesNoEraPlutuscall =
         . P.p2pOff
         . P.traceForwardingOn . P.newTracing
         . P.analysisStandard
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
         . P.desc "Small dataset, honest 15 epochs duration"
 
       loop            = plutusCall & V.plutusTypeLoop    . V.plutusDoubleSaturation     . P.analysisSizeModerate . P.analysisEpoch3Plus

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Plutuscall.hs

@@ -34,7 +34,6 @@ profilesNoEraChainsync =
          --       Remove and use `V.datasetEmpty` in module "Scenario.Base".
         . P.delegators 0
         . P.analysisPerformance
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
         . P.preset "mainnet"
         . P.desc "Mainnet chain syncing benchmark"
       {--

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Scenario/Chainsync.hs

@@ -34,7 +34,6 @@ profilesNoEraIdle =
          --       Remove and use `V.datasetEmpty` in module "Scenario.Base".
         . P.delegators 6
         . P.analysisUnitary
-        . V.clusterDefault -- TODO: "cluster" should be "null" here.
       updateQuorum = P.shelley (KeyMap.insert "updateQuorum" (Aeson.Number 1))
   in [
     idle & P.name "devops" . V.timescaleDevops     . P.extraFutureOffset 10 . updateQuorum . P.traceForwardingOn . P.newTracing . P.p2pOff . P.analysisOff