agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-06-01 05:11:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12774 from overleaf/ds-em-mongo-secondary-db-fix

Browse Source 
Bug fix - Mongo DB secondary preference

GitOrigin-RevId: d9adc0a7e1ee5085b34c5c1ddfdc715967607fc3
This commit is contained in:
Jessica Lawshe
2023-04-27 08:56:31 -05:00
committed by Copybot
parent 42a52a0d96
commit 35c776b512
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/web/app/src/Features/InactiveData/InactiveProjectManager.js
View File

@@ -18,6 +18,7 @@ const ProjectGetter = require('../Project/ProjectGetter')
const ProjectUpdateHandler = require('../Project/ProjectUpdateHandler')
const { Project } = require('../../models/Project')
const { ObjectId } = require('mongodb')
const { READ_PREFERENCE_SECONDARY } = require('../../infrastructure/mongodb')
const MILISECONDS_IN_DAY = 86400000
module.exports = InactiveProjectManager = {
@@ -71,7 +72,7 @@ module.exports = InactiveProjectManager = {
.select('_id')
.sort({ _id: 1 })
.limit(limit)
.read('secondary')
.read(READ_PREFERENCE_SECONDARY)
.exec(function (err, projects) {
if (err != null) {
logger.err({ err }, 'could not get projects for deactivating')

3
services/web/app/src/Features/Project/ProjectDeleter.js
View File

@@ -20,6 +20,7 @@ const TpdsUpdateSender = require('../ThirdPartyDataStore/TpdsUpdateSender')
const ChatApiHandler = require('../Chat/ChatApiHandler')
const moment = require('moment')
const { promiseMapWithLimit } = require('../../util/promises')
const { READ_PREFERENCE_SECONDARY } = require('../../infrastructure/mongodb')
const EXPIRE_PROJECTS_AFTER_DAYS = 90
const PROJECT_EXPIRATION_BATCH_SIZE = 10000
@@ -94,7 +95,7 @@ async function expireDeletedProjectsAfterDuration() {
{ 'deleterData.deletedProjectId': 1 }
)
.limit(PROJECT_EXPIRATION_BATCH_SIZE)
.read('secondary')
.read(READ_PREFERENCE_SECONDARY)
const projectIds = _.shuffle(
deletedProjects.map(
deletedProject => deletedProject.deleterData.deletedProjectId

6
services/web/app/src/infrastructure/mongodb.js
View File

@@ -12,10 +12,10 @@ if (
)
}
const READ_PREFERENCE_PRIMARY = ReadPreference.primary
const READ_PREFERENCE_PRIMARY = ReadPreference.primary.mode
const READ_PREFERENCE_SECONDARY = Settings.mongo.hasSecondaries
? ReadPreference.secondary
: ReadPreference.secondaryPreferred
? ReadPreference.secondary.mode
: ReadPreference.secondaryPreferred.mode
let setupDbPromise
async function waitForDb() {