Jelajahi Sumber

Merge pull request #3011 from overleaf/jpa-optionally-increase-mongo-timeout

[misc] optionally increase the mongo timeout

GitOrigin-RevId: f204b017cf3bbb195667739d714b99bfd8a7eaa1
Jakob Ackermann 6 tahun lalu
induk
melakukan
397bd034c7

+ 1 - 0
services/web/app/src/infrastructure/Mongoose.js

@@ -19,6 +19,7 @@ mongoose.connect(
     poolSize: POOL_SIZE,
     poolSize: POOL_SIZE,
     config: { autoIndex: false },
     config: { autoIndex: false },
     useMongoClient: true,
     useMongoClient: true,
+    socketTimeoutMS: Settings.mongo.socketTimeoutMS,
     appname: 'web'
     appname: 'web'
   }
   }
 )
 )

+ 1 - 0
services/web/config/settings.defaults.coffee

@@ -43,6 +43,7 @@ module.exports = settings =
 	mongo:
 	mongo:
 		url : process.env['MONGO_CONNECTION_STRING'] || process.env['MONGO_URL'] || "mongodb://#{process.env['MONGO_HOST'] or '127.0.0.1'}/sharelatex"
 		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
 		poolSize: parseInt(process.env['MONGO_POOL_SIZE'], 10) || 10
+		socketTimeoutMS: parseInt(process.env['MONGO_SOCKET_TIMEOUT'], 10) || 30000
 
 
 	redis:
 	redis:
 		web:
 		web:

+ 1 - 0
services/web/docker-compose.yml

@@ -33,6 +33,7 @@ services:
       MOCHA_GREP: ${MOCHA_GREP}
       MOCHA_GREP: ${MOCHA_GREP}
       NODE_ENV: test
       NODE_ENV: test
       LOCK_MANAGER_MAX_LOCK_WAIT_TIME: 30000
       LOCK_MANAGER_MAX_LOCK_WAIT_TIME: 30000
+      MONGO_SOCKET_TIMEOUT: 60000
       # SHARELATEX_ALLOW_ANONYMOUS_READ_AND_WRITE_SHARING: 'true'
       # SHARELATEX_ALLOW_ANONYMOUS_READ_AND_WRITE_SHARING: 'true'
       SHARELATEX_CONFIG:
       SHARELATEX_CONFIG:
     command: npm run test:acceptance:app
     command: npm run test:acceptance:app