github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13256 from overleaf/csh-issue-13004-max-retries

Browse source 
Increase the maximum retries for the delete-old-history-chunks cron job

GitOrigin-RevId: 8054ac76bbae24d0a3ba032c50c9647c044aef27
This commit is contained in:
Christopher Hoskin 2023-06-01 15:36:32 +01:00 committed by Copybot
parent a9da694036
commit cbaf1c3556
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/object-persistor/src/GcsPersistor.js
View file

@ -15,7 +15,14 @@ module.exports = class GcsPersistor extends AbstractPersistor {
// endpoint settings will be null by default except for tests // endpoint settings will be null by default except for tests
// that's OK - GCS uses the locally-configured service account by default // that's OK - GCS uses the locally-configured service account by default
this.storage = new Storage(this.settings.endpoint) const storageOptions = {}
if (this.settings.endpoint) {
storageOptions.projectId = this.settings.endpoint.projectId
storageOptions.apiEndpoint = this.settings.endpoint.apiEndpoint
}
storageOptions.retryOptions = this.settings.retryOptions
this.storage = new Storage(storageOptions)
} }
async sendFile(bucketName, key, fsPath) { async sendFile(bucketName, key, fsPath) {

3
services/history-v1/config/custom-environment-variables.json
View file

@ -19,6 +19,9 @@
"endpoint": { "endpoint": {
"apiEndpoint": "GCS_API_ENDPOINT", "apiEndpoint": "GCS_API_ENDPOINT",
"projectId": "GCS_PROJECT_ID" "projectId": "GCS_PROJECT_ID"
},
"retryOptions": {
"maxRetries": "GCS_MAX_RETRIES"
} }
}, },
"fallback": { "fallback": {

1
services/history-v1/storage/lib/persistor.js
View file

@ -19,6 +19,7 @@ convertKey('gcs.unlockBeforeDelete', s => s === 'true')
convertKey('gcs.unsignedUrls', s => s === 'true') convertKey('gcs.unsignedUrls', s => s === 'true')
convertKey('gcs.signedUrlExpiryInMs', s => parseInt(s, 10)) convertKey('gcs.signedUrlExpiryInMs', s => parseInt(s, 10))
convertKey('gcs.deleteConcurrency', s => parseInt(s, 10)) convertKey('gcs.deleteConcurrency', s => parseInt(s, 10))
convertKey('gcs.retryOptions.maxRetries', s => parseInt(s, 10))
convertKey('fallback.buckets', s => JSON.parse(s || '{}')) convertKey('fallback.buckets', s => JSON.parse(s || '{}'))
persistorConfig.Metrics = metrics persistorConfig.Metrics = metrics