fix: counts and amp up HW

celestiaorg · Feb 16, 2023 · e4fa529 · e4fa529
1 parent 36b3ef8
commit e4fa529
Show file tree

Hide file tree

Showing 17 changed files with 273 additions and 166 deletions.
diff --git a/compositions/cluster-k8s/blocksync-historical/128-square-size/1-4-32-default-getters.toml b/compositions/cluster-k8s/blocksync-historical/128-square-size/1-4-32-default-getters.toml
@@ -22,14 +22,14 @@
   peers-limit = "3"
   bootstrapper = "1"
   interconnect-bridges = "1"
-  historical-syncers-max-id = "2"
+  historical-syncers-count = "2"
 
 [[groups]]
   id = "validators"
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "6"
+    cpu = "1"
   [groups.instances]
     count = 1
     percentage = 0.0
@@ -49,7 +49,7 @@
   id = "bridges"
   builder = "docker:generic"
   [groups.resources]
-    memory = "10Gi"
+    memory = "8Gi"
     cpu = "4"
   [groups.instances]
     count = 3
@@ -70,7 +70,7 @@
   id = "fulls"
   builder = "docker:generic"
   [groups.resources]
-    memory = "10Gi"
+    memory = "8Gi"
     cpu = "4"
   [groups.instances]
     count = 32

diff --git a/compositions/cluster-k8s/blocksync-historical/128-square-size/1-4-32-ipld-only.toml b/compositions/cluster-k8s/blocksync-historical/128-square-size/1-4-32-ipld-only.toml
@@ -21,12 +21,15 @@
   otel-collector-address = "178.128.163.171:4318"
   getter = "ipld"
   peers-limit = "3"
+  bootstrapper = "1"
+  interconnect-bridges = "1"
+  historical-syncers-count = "2"
 
 [[groups]]
   id = "validators"
   builder = "docker:generic"
   [groups.resources]
-    memory = "4Gi"
+    memory = "8Gi"
     cpu = "1"
   [groups.instances]
     count = 1
@@ -48,7 +51,7 @@
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "1"
+    cpu = "4"
   [groups.instances]
     count = 3
     percentage = 0.0
@@ -69,7 +72,7 @@
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "1"
+    cpu = "4"
   [groups.instances]
     count = 32
     percentage = 0.0

diff --git a/compositions/cluster-k8s/blocksync-historical/256-square-size/1-4-32-default-getters.toml b/compositions/cluster-k8s/blocksync-historical/256-square-size/1-4-32-default-getters.toml
@@ -22,14 +22,14 @@
   peers-limit = "3"
   bootstrapper = "1"
   interconnect-bridges = "1"
-  historical-syncers-max-id = "2"
+  historical-syncers-count = "2"
 
 [[groups]]
   id = "validators"
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "6"
+    cpu = "1"
   [groups.instances]
     count = 1
     percentage = 0.0
@@ -49,7 +49,7 @@
   id = "bridges"
   builder = "docker:generic"
   [groups.resources]
-    memory = "10Gi"
+    memory = "8Gi"
     cpu = "4"
   [groups.instances]
     count = 3
@@ -70,7 +70,7 @@
   id = "fulls"
   builder = "docker:generic"
   [groups.resources]
-    memory = "10Gi"
+    memory = "8Gi"
     cpu = "4"
   [groups.instances]
     count = 32

diff --git a/compositions/cluster-k8s/blocksync-historical/256-square-size/1-4-32-ipld-only.toml b/compositions/cluster-k8s/blocksync-historical/256-square-size/1-4-32-ipld-only.toml
@@ -24,14 +24,14 @@
   bootstrapper = "1"
   interconnect-bridges = "0"
   use-ipld-fallback = "0"
-  historical-syncers-max-id = "16"
+  historical-syncers-count = "16"
 
 [[groups]]
   id = "validators"
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "2"
+    cpu = "1"
   [groups.instances]
     count = 1
     percentage = 0.0

diff --git a/compositions/cluster-k8s/blocksync-historical/256-square-size/1-4-32-shrex-only.toml b/compositions/cluster-k8s/blocksync-historical/256-square-size/1-4-32-shrex-only.toml
diff --git a/compositions/cluster-k8s/blocksync-historical/64-square-size/1-4-32-default-getters.toml b/compositions/cluster-k8s/blocksync-historical/64-square-size/1-4-32-default-getters.toml
@@ -19,13 +19,16 @@
   block-height = 100
   target-height = 70
   otel-collector-address = "178.128.163.171:4318"
-  getter = "default"
+  getter = "shrex"
+  bootstrapper = "1"
+  interconnect-bridges = "1"
+  historical-syncers-count = "2"
 
 [[groups]]
   id = "validators"
   builder = "docker:generic"
   [groups.resources]
-    memory = "4Gi"
+    memory = "8Gi"
     cpu = "1"
   [groups.instances]
     count = 1
@@ -47,7 +50,7 @@
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "1"
+    cpu = "4"
   [groups.instances]
     count = 3
     percentage = 0.0
@@ -68,7 +71,7 @@
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "1"
+    cpu = "4"
   [groups.instances]
     count = 32
     percentage = 0.0

diff --git a/compositions/cluster-k8s/blocksync-historical/64-square-size/1-4-32-ipld-only.toml b/compositions/cluster-k8s/blocksync-historical/64-square-size/1-4-32-ipld-only.toml
@@ -20,12 +20,15 @@
   target-height = 70
   otel-collector-address = "178.128.163.171:4318"
   getter = "ipld"
+  bootstrapper = "1"
+  interconnect-bridges = "1"
+  historical-syncers-count = "2"
 
 [[groups]]
   id = "validators"
   builder = "docker:generic"
   [groups.resources]
-    memory = "4Gi"
+    memory = "8Gi"
     cpu = "1"
   [groups.instances]
     count = 1
@@ -47,7 +50,7 @@
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "1"
+    cpu = "4"
   [groups.instances]
     count = 3
     percentage = 0.0
@@ -68,7 +71,7 @@
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "1"
+    cpu = "4"
   [groups.instances]
     count = 32
     percentage = 0.0

diff --git a/...8-square-size/1-6-64-default-getters.toml → ...8-square-size/1-3-32-default-getters.toml b/...8-square-size/1-6-64-default-getters.toml → ...8-square-size/1-3-32-default-getters.toml
@@ -22,11 +22,10 @@
   full = "32"
   block-height = "30"
   otel-collector-address = "178.128.163.171:4318"
-  getter = "" # must be left empty for default getters
+  getter = "shrex"
   network-partition-height = "10"
   fullnode-entrypoints-list = "3" # provide string list of fullnode id as follows: 10-1-44-31 (this equals [10, 1, 44, 31]
   bridgenode-entrypoints-list = "1" # provide a string list of bridge node ids as follows: 1-2-5-19-3 (this equals [1,2,5,19,3]
-  use-ipld-fallback = "1"
   peers-limit = "6"
   interconnect-bridges = "0"
   bootstrapper = "1"
@@ -35,8 +34,8 @@
   id = "validators"
   builder = "docker:generic"
   [groups.resources]
-    memory = "4Gi"
-    cpu = "1"
+    memory = "8Gi"
+    cpu = "2"
   [groups.instances]
     count = 1
     percentage = 0.0
@@ -57,7 +56,7 @@
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "1"
+    cpu = "4"
   [groups.instances]
     count = 3
     percentage = 0.0
@@ -78,7 +77,7 @@
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "1"
+    cpu = "4"
   [groups.instances]
     count = 32
     percentage = 0.0

diff --git a/...ion/128-square-size/1-6-64-ipld-only.toml → ...ion/128-square-size/1-3-32-ipld-only.toml b/...ion/128-square-size/1-6-64-ipld-only.toml → ...ion/128-square-size/1-3-32-ipld-only.toml
@@ -5,7 +5,7 @@
 [global]
   plan = "celestia"
   case = "blocksyncbench-latest-net-parition"
-  total_instances = 37
+  total_instances = 36
   builder = "docker:generic"
   runner = "cluster:k8s"
   disable_metrics = false
@@ -18,7 +18,7 @@
   persistent-peers = "1"
   msg-size = "800000"
   validator = "1"
-  bridge = "4"
+  bridge = "3"
   full = "32"
   block-height = "30"
   otel-collector-address = "178.128.163.171:4318"
@@ -34,8 +34,8 @@
   id = "validators"
   builder = "docker:generic"
   [groups.resources]
-    memory = "4Gi"
-    cpu = "1"
+    memory = "8Gi"
+    cpu = "2"
   [groups.instances]
     count = 1
     percentage = 0.0
@@ -56,7 +56,7 @@
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "1"
+    cpu = "4"
   [groups.instances]
     count = 4
     percentage = 0.0
@@ -77,7 +77,7 @@
   builder = "docker:generic"
   [groups.resources]
     memory = "8Gi"
-    cpu = "1"
+    cpu = "4"
   [groups.instances]
     count = 32
     percentage = 0.0