Upgrade to mongo 6 and use sortArray for workflow crawls (#764) (#765)

fixes from 1.4.1:
* Upgrade to mongo 6 and use  for workflow crawls

* update readiness probe with timeouts doubled, and failure threshold increased for slower 'mongosh' readiness check

update versions to 1.5.0-beta.0 in backend and frontend

Co-authored-by: Tessa Walsh <tessa@bitarchivist.net>
This commit is contained in:
Ilya Kreymer 2023-04-11 18:22:07 -07:00 committed by GitHub
parent 07fb7317fe
commit 85b6a05419
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 13 deletions

View File

@ -31,7 +31,7 @@
register: db_check register: db_check
- name: d_ocean | db | create mongodb database - name: d_ocean | db | create mongodb database
ansible.builtin.command: doctl databases create {{ db_name }} --region {{ droplet_region }} --engine mongodb --version 5 --output json ansible.builtin.command: doctl databases create {{ db_name }} --region {{ droplet_region }} --engine mongodb --version 6 --output json
async: 1800 async: 1800
poll: 60 poll: 60
register: db_create_result register: db_create_result

View File

@ -528,11 +528,9 @@ class CrawlConfigOps:
{ {
"$set": { "$set": {
"sortedCrawls": { "sortedCrawls": {
"$function": { "$sortArray": {
# pylint: disable=line-too-long "input": "$finishedCrawls",
"body": "function(arr) {return arr.sort((a,b) => (a.finished > b.finished) ? -1 : ((b.finished > a.finished) ? 1 : 0));}", "sortBy": {"finished": -1},
"args": ["$finishedCrawls"],
"lang": "js",
} }
} }
} }

View File

@ -1,2 +1,2 @@
""" current version """ """ current version """
__version__ = "1.4.0" __version__ = "1.5.0-beta.0"

View File

@ -101,16 +101,19 @@ spec:
cpu: {{ .Values.mongo_requests_cpu }} cpu: {{ .Values.mongo_requests_cpu }}
memory: {{ .Values.mongo_requests_memory }} memory: {{ .Values.mongo_requests_memory }}
# reenable for now with mongo 5.0.x # should work with 6.0.x with longer timeout
readinessProbe: readinessProbe:
timeoutSeconds: 10 timeoutSeconds: 20
periodSeconds: 40
initialDelaySeconds: 5
successThreshold: 1 successThreshold: 1
failureThreshold: 2 failureThreshold: 5
exec: exec:
command: command:
- mongo - mongosh
- --eval - --eval
- db.adminCommand('ping') - db.adminCommand('ping')
- --quiet
--- ---
apiVersion: v1 apiVersion: v1

View File

@ -99,7 +99,7 @@ mongo_local: true
mongo_host: "local-mongo.default" mongo_host: "local-mongo.default"
mongo_image: "docker.io/library/mongo:5.0.11" mongo_image: "docker.io/library/mongo:6.0.5"
mongo_pull_policy: "IfNotPresent" mongo_pull_policy: "IfNotPresent"
mongo_requests_cpu: "12m" mongo_requests_cpu: "12m"

View File

@ -1,6 +1,6 @@
{ {
"name": "browsertrix-frontend", "name": "browsertrix-frontend",
"version": "1.4.0", "version": "1.5.0-beta.0",
"main": "index.ts", "main": "index.ts",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {