Skip to content

Commit ab607db

Browse files
Merge branch 'feature/xcm-config-update' into feature/update-for-async-backing
2 parents 65b2303 + 1ca87cc commit ab607db

9 files changed

+55
-20
lines changed

k8-manifests/gcloud/hashed-collator-1-statefulset-archive.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
containers:
1919
- name: hashed-collator-1
2020
imagePullPolicy: IfNotPresent
21-
image: sebastianmontero/hashed-substrate-collator-hashed:56eef87e580bc0cbe3e0617f204a2ef3257ab9d6
21+
image: sebastianmontero/hashed-substrate-collator-hashed:cb6e9e318b79192263dfb87fb777e3362f058d32
2222
command: ["/var/www/hashed-substrate/scripts/start_collator.sh"]
2323
args: ["hashed", "/var/www/hashed/hashed"]
2424
volumeMounts:
@@ -37,8 +37,21 @@ spec:
3737
value: "archive"
3838
- name: RELAY_PRUNING
3939
value: "1000"
40+
- name: RPC_MAX_CONNECTIONS
41+
value: "500"
42+
- name: RPC_METHODS
43+
value: "unsafe"
44+
# - name: COLLATOR_DB_CACHE
45+
# value: "7000"
46+
# - name: RELAY_DB_CACHE
47+
# value: "7000"
48+
# - name: RELAY_DB_CACHE
49+
# value: 7000
50+
4051
# - name: RUST_LOG
4152
# value: "debug"
53+
- name: RUST_LOG
54+
value: "lusage=trace"
4255
# - name: RUST_LOG
4356
# value: "sub-libp2p=trace"
4457
# - name: RUST_LOG
@@ -51,7 +64,7 @@ spec:
5164
# optional: false
5265
resources:
5366
limits:
54-
memory: "25G"
67+
memory: "28G"
5568
cpu: "7.5"
5669
# requests:
5770
# ephemeral-storage: 25Gi
@@ -78,7 +91,7 @@ spec:
7891
resources:
7992
requests:
8093
storage: 1Ti
81-
storageClassName: standard-rwo
94+
storageClassName: premium-rwo
8295
---
8396
apiVersion: v1
8497
kind: Service

k8-manifests/gcloud/hashed-collator-3-statefulset.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ spec:
4949
# optional: false
5050
resources:
5151
limits:
52-
memory: "8G"
53-
cpu: "2"
52+
memory: "10G"
53+
cpu: "3"
5454
# requests:
5555
# ephemeral-storage: 25Gi
5656
ports:
@@ -59,8 +59,13 @@ spec:
5959
- containerPort: 9946
6060
- containerPort: 30333
6161
- containerPort: 40333
62-
# nodeSelector:
63-
# node.kubernetes.io/instance-type: c6id.2xlarge
62+
nodeSelector:
63+
cloud.google.com/gke-nodepool: hashed-systems-node-pool-hp
64+
tolerations:
65+
- key: special
66+
operator: Equal
67+
value: hp
68+
effect: NoSchedule
6469
volumeClaimTemplates:
6570
- metadata:
6671
name: hashed-collator-3-pvc
@@ -70,8 +75,8 @@ spec:
7075
- ReadWriteOnce
7176
resources:
7277
requests:
73-
storage: 400Gi
74-
storageClassName: standard-rwo
78+
storage: 600Gi
79+
storageClassName: premium-rwo
7580
---
7681
apiVersion: v1
7782
kind: Service

k8-manifests/gcloud/md5-collator-1-statefulset-archive.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ spec:
5757
# optional: false
5858
resources:
5959
limits:
60-
memory: "25G"
61-
cpu: "7.5"
60+
memory: "18G"
61+
cpu: "4.5"
6262
# requests:
6363
# ephemeral-storage: 25Gi
6464
ports:
@@ -84,7 +84,7 @@ spec:
8484
resources:
8585
requests:
8686
storage: 1Ti
87-
storageClassName: standard-rwo
87+
storageClassName: premium-rwo
8888
---
8989
apiVersion: v1
9090
kind: Service

k8-manifests/gcloud/md5-collator-2-statefulset.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ spec:
5151
# optional: false
5252
resources:
5353
limits:
54-
memory: "12G"
55-
cpu: "3.5"
54+
memory: "8G"
55+
cpu: "2"
5656
# requests:
5757
# ephemeral-storage: 25Gi
5858
ports:
@@ -62,7 +62,12 @@ spec:
6262
- containerPort: 30333
6363
- containerPort: 40333
6464
# nodeSelector:
65-
# node.kubernetes.io/instance-type: c6id.2xlarge
65+
# cloud.google.com/gke-nodepool: hashed-systems-node-pool-hp
66+
# tolerations:
67+
# - key: special
68+
# operator: Equal
69+
# value: hp
70+
# effect: NoSchedule
6671
volumeClaimTemplates:
6772
- metadata:
6873
name: md5-collator-2-pvc

k8-manifests/hashed-collator-1-statefulset-archive-aws.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
containers:
1919
- name: hashed-collator-1
2020
imagePullPolicy: IfNotPresent
21-
image: sebastianmontero/hashed-substrate-collator-hashed:56eef87e580bc0cbe3e0617f204a2ef3257ab9d6
21+
image: sebastianmontero/hashed-substrate-collator-hashed:e3cbb15367469502193220e4070d063a3d45b4c4
2222
command: ["/var/www/hashed-substrate/scripts/start_collator.sh"]
2323
args: ["hashed", "/var/www/hashed/hashed"]
2424
volumeMounts:
@@ -37,6 +37,10 @@ spec:
3737
value: "archive"
3838
- name: RELAY_PRUNING
3939
value: "1000"
40+
- name: RPC_MAX_CONNECTIONS
41+
value: "500"
42+
- name: RPC_METHODS
43+
value: "unsafe"
4044
# - name: RUST_LOG
4145
# value: "debug"
4246
# - name: RUST_LOG
@@ -51,7 +55,7 @@ spec:
5155
# optional: false
5256
resources:
5357
limits:
54-
memory: "15G"
58+
memory: "150G"
5559
cpu: "7.5"
5660
# requests:
5761
# ephemeral-storage: 25Gi

k8-manifests/hashed-collator-3-statefulset-aws.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ spec:
4949
# optional: false
5050
resources:
5151
limits:
52-
memory: "11G"
52+
memory: "110G"
5353
cpu: "4.5"
5454
# requests:
5555
# ephemeral-storage: 25Gi

k8-manifests/md5-collator-1-statefulset-archive-aws.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
# optional: false
5858
resources:
5959
limits:
60-
memory: "15G"
60+
memory: "150G"
6161
cpu: "7.5"
6262
# requests:
6363
# ephemeral-storage: 25Gi

k8-manifests/md5-collator-2-statefulset-aws.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
resources:
5353
limits:
5454
memory: "4G"
55-
cpu: "3"
55+
cpu: "100"
5656
# requests:
5757
# ephemeral-storage: 25Gi
5858
ports:

scripts/start_collator.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ if [[ ! -z ${BLOCKS_PRUNING} ]]; then
5959
collator_args+=(--blocks-pruning ${BLOCKS_PRUNING})
6060
fi
6161

62+
if [[ ! -z ${COLLATOR_DB_CACHE} ]]; then
63+
collator_args+=(--db-cache ${COLLATOR_DB_CACHE})
64+
fi
65+
6266
if [[ ! -z ${LISTEN_ADDR} ]]; then
6367
collator_args+=(--listen-addr ${LISTEN_ADDR})
6468
else
@@ -102,6 +106,10 @@ if [[ ! -z ${RPC_METHODS} ]]; then
102106
relay_args+=(--rpc-methods ${RPC_METHODS})
103107
fi
104108

109+
if [[ ! -z ${RELAY_DB_CACHE} ]]; then
110+
relay_args+=(--db-cache ${RELAY_DB_CACHE})
111+
fi
112+
105113

106114
# collator_args+=($chain_spec)
107115

0 commit comments

Comments
 (0)