Skip to content

Commit

Permalink
PM-1712 - Fix mina-archive values
Browse files Browse the repository at this point in the history
  • Loading branch information
johnmarcou committed Jun 10, 2024
1 parent c8a84bc commit 16569b9
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 28 deletions.
4 changes: 2 additions & 2 deletions mina-archive/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ helmfile status
| dbBootstrap.podAnnotations | object | `{}` | Annotations to apply to the pod |
| dbBootstrap.postCustomSql | string | `"ALTER DATABASE {{ .Values.databaseName }} SET DEFAULT_TRANSACTION_ISOLATION TO SERIALIZABLE"` | Execute SQL inline command after loading the SQL file urls |
| dbBootstrap.sqlFileUrls | list | `[]` | SQL file urls to execute |
| dumpExporter.enabled | bool | `true` | Enabled dump exporter |
| dumpExporter.enabled | bool | `false` | Enabled dump exporter |
| dumpExporter.podAnnotations | object | `{}` | Annotations to the dump exporter |
| dumpExporter.s3.bucket | string | `""` | S3 bucket to export the dump to |
| dumpExporter.schedule | string | `"@midnight"` | Frequency to execute the dump exporter |
Expand All @@ -74,7 +74,7 @@ helmfile status
| image.repository | string | `"gcr.io/o1labs-192920/mina-archive"` | Docker image repository |
| image.tag | string | `"2.0.0berkeley-rc1-1551e2f-focal"` | Docker image tag |
| missingBlocksGuardian.autoImportBlockUrl | string | `""` | URL to auto import a block when running the missing blocks guardian |
| missingBlocksGuardian.enabled | bool | `false` | Enabled missing blocks guardian |
| missingBlocksGuardian.enabled | bool | `true` | Enabled missing blocks guardian |
| missingBlocksGuardian.podAnnotations | object | `{}` | Annotations to the missing blocks guardian |
| missingBlocksGuardian.precomputedBlocksUrl | string | `""` | URL to fetch the pre-computed blocks from |
| missingBlocksGuardian.schedule | string | `"@hourly"` | Frequency to execute the missing blocks guardian |
Expand Down
19 changes: 6 additions & 13 deletions mina-archive/examples/dev.values.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
network: qanet
network: mainnet
databaseName: archive
image:
repository: gcr.io/o1labs-192920/mina-archive
tag: 2.0.0berkeley-rc1-1551e2f-focal
repository: minaprotocol/mina-archive
tag: 3.0.0-93e0279-bullseye

serviceAccount:
annotations:
Expand All @@ -19,30 +19,23 @@ postgresql:

dbBootstrap:
enabled: true

createDatabase: true
sqlFileUrls:
- https://raw.githubusercontent.com/MinaProtocol/mina/develop/src/app/archive/create_schema.sql
extraSqlFileUrls:
- https://raw.githubusercontent.com/MinaProtocol/mina/develop/src/app/archive/zkapp_tables.sql

# createDatabase: false
# sqlFileUrls:
# - https://673156464838-mina-archive-node-backups.s3-us-west-2.amazonaws.com/qanet/qanet-archive-dump-[DATE]_0000.sql.tar.gz

node:
replicas: 1
configFileUrl: http://673156464838-mina-genesis-ledgers.s3-us-west-2.amazonaws.com/qanet/genesis_ledger.json
configFileUrl: http://673156464838-mina-genesis-ledgers.s3-us-west-2.amazonaws.com/mainnet/genesis_ledger.json

missingBlocksGuardian:
enabled: true
suspend: true
precomputedBlocksUrl: https://673156464838-mina-precomputed-blocks.s3-us-west-2.amazonaws.com/qanet
autoImportBlockUrl: https://673156464838-mina-precomputed-blocks.s3-us-west-2.amazonaws.com/qanet/qanet-500-3NKA1RcRkYrPmASYvhRuW68N8a9p6kRjpCaWxUj67nKwShZ76ZHB.json
# autoImportBlockUrl: https://673156464838-mina-precomputed-blocks.s3.us-west-2.amazonaws.com/qanet/qanet-34205-3NKnu7LiJ627UWpT3g7y4xFQSCAQnYHQehyRQ51eibam53XgpQFh.json
precomputedBlocksUrl: https://673156464838-mina-precomputed-blocks.s3-us-west-2.amazonaws.com/mainnet

dumpExporter:
enabled: false
enabled: true
suspend: true
s3:
bucket: 673156464838-mina-archive-node-backups
17 changes: 8 additions & 9 deletions mina-archive/examples/mainnet.values.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
network: mainnet
databaseName: archive_balances_migrated
databaseName: archive
image:
repository: minaprotocol/mina-archive
tag: 1.4.1-e76fc1c-bullseye
tag: 3.0.0-93e0279-bullseye

serviceAccount:
annotations:
Expand All @@ -22,15 +22,14 @@ dbBootstrap:

createDatabase: false
sqlFileUrls:
# - https://673156464838-mina-archive-node-backups.s3-us-west-2.amazonaws.com/mainnet/mainnet-archive-dump-[DATE]_0000.sql.tar.gz
- https://673156464838-mina-archive-node-backups.s3.us-west-2.amazonaws.com/mainnet/mainnet-archive-dump-2024-04-28_0000.sql.tar.gz
# - https://storage.googleapis.com/mina-archive-dumps/backup-mainnet-pre-hf-dry-run-2-migrated-dump-2024-05-02_0700.sql.tar.gz

node:
replicas: 1
- https://673156464838-mina-archive-node-backups.s3-us-west-2.amazonaws.com/mainnet/mainnet-archive-dump-[DATE]_0000.sql.tar.gz

missingBlocksGuardian:
enabled: true
suspend: true
precomputedBlocksUrl: https://673156464838-mina-precomputed-blocks.s3.us-west-2.amazonaws.com/mainnet
autoImportBlockUrl: https://673156464838-mina-precomputed-blocks.s3.us-west-2.amazonaws.com/mainnet/mainnet-350000-3NLGassgPE49SrxMtvz5buEukiAZJjNHSJaqo3cmUjbUfDC8Jrm3.json

dumpExporter:
enabled: true
s3:
bucket: 673156464838-mina-archive-node-backups
2 changes: 1 addition & 1 deletion mina-archive/scripts/wait-for-db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ main() {
info "Locking database: $DB_BOOTSTRAP_LOCKING_DATABASE_NAME"

info "Checking if database server is online"
retry_while check_database_is_online 60 1 # 1 min
retry_while check_database_is_online 120 1 # 1 min
info "Database is online"

info "Checking if bootstrap is done"
Expand Down
2 changes: 1 addition & 1 deletion mina-archive/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spec:
{{- end }}
env:
{{- include "pgEnvVars" . | nindent 12 }}
- name: ARCHIVE_node_PORT_RPC
- name: ARCHIVE_NODE_PORT_RPC
value: {{ .Values.node.ports.rpc | quote }}
{{- if .Values.node.extraEnvVars }}
{{- toYaml .Values.node.extraEnvVars | nindent 12 }}
Expand Down
4 changes: 2 additions & 2 deletions mina-archive/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ node:

missingBlocksGuardian:
# -- Enabled missing blocks guardian
enabled: false
enabled: true
# -- Suspend the missing blocks guardian execution
suspend: false
# -- Frequency to execute the missing blocks guardian
Expand All @@ -140,7 +140,7 @@ missingBlocksGuardian:

dumpExporter:
# -- Enabled dump exporter
enabled: true
enabled: false
# -- Suspend the dump exporter execution
suspend: false
# -- Frequency to execute the dump exporter
Expand Down

0 comments on commit 16569b9

Please sign in to comment.