From 397bd034c75a7d7b8fa0801a821fe4b70652461c Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 15 Jul 2020 12:47:15 +0200 Subject: [PATCH] Merge pull request #3011 from overleaf/jpa-optionally-increase-mongo-timeout [misc] optionally increase the mongo timeout GitOrigin-RevId: f204b017cf3bbb195667739d714b99bfd8a7eaa1 --- services/web/app/src/infrastructure/Mongoose.js | 1 + services/web/config/settings.defaults.coffee | 1 + services/web/docker-compose.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/services/web/app/src/infrastructure/Mongoose.js b/services/web/app/src/infrastructure/Mongoose.js index ac2c3cf88c..7dc3f0c310 100644 --- a/services/web/app/src/infrastructure/Mongoose.js +++ b/services/web/app/src/infrastructure/Mongoose.js @@ -19,6 +19,7 @@ mongoose.connect( poolSize: POOL_SIZE, config: { autoIndex: false }, useMongoClient: true, + socketTimeoutMS: Settings.mongo.socketTimeoutMS, appname: 'web' } ) diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index b887802370..ae79e95e97 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -43,6 +43,7 @@ module.exports = settings = mongo: url : process.env['MONGO_CONNECTION_STRING'] || process.env['MONGO_URL'] || "mongodb://#{process.env['MONGO_HOST'] or '127.0.0.1'}/sharelatex" poolSize: parseInt(process.env['MONGO_POOL_SIZE'], 10) || 10 + socketTimeoutMS: parseInt(process.env['MONGO_SOCKET_TIMEOUT'], 10) || 30000 redis: web: diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml index eb74535e2b..b6f4289cf5 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -33,6 +33,7 @@ services: MOCHA_GREP: ${MOCHA_GREP} NODE_ENV: test LOCK_MANAGER_MAX_LOCK_WAIT_TIME: 30000 + MONGO_SOCKET_TIMEOUT: 60000 # SHARELATEX_ALLOW_ANONYMOUS_READ_AND_WRITE_SHARING: 'true' SHARELATEX_CONFIG: command: npm run test:acceptance:app