-
-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add code for revision cleanup (#6442)
* Add initial code for revision cleanup * Some improvements - code cleanup * Cleanup logging * Add button in admin backend to cleanup revisions of a specific pad * Disable cleanup by default and show errors in admin area * Improve cleanup code * Load revisions for cleanup in parallel * Consider saved revisions during pad cleanup
- Loading branch information
Showing
10 changed files
with
283 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| import {AChangeSet} from "./PadType"; | ||
|
|
||
| export type Revision = { | ||
| changeset: AChangeSet, | ||
| meta: { | ||
| author: string, | ||
| timestamp: number, | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| 'use strict' | ||
|
|
||
| import {AChangeSet} from "../types/PadType"; | ||
| import {Revision} from "../types/Revision"; | ||
|
|
||
| const promises = require('./promises'); | ||
| const padManager = require('ep_etherpad-lite/node/db/PadManager'); | ||
| const db = require('ep_etherpad-lite/node/db/DB'); | ||
| const Changeset = require('ep_etherpad-lite/static/js/Changeset'); | ||
| const padMessageHandler = require('ep_etherpad-lite/node/handler/PadMessageHandler'); | ||
| const log4js = require('log4js'); | ||
| const logger = log4js.getLogger('cleanup'); | ||
|
|
||
| exports.deleteAllRevisions = async (padID: string): Promise<void> => { | ||
|
|
||
| const randomPadId = padID + 'aertdfdf' + Math.random().toString(10) | ||
|
|
||
| let pad = await padManager.getPad(padID); | ||
| await pad.copyPadWithoutHistory(randomPadId, false); | ||
| pad = await padManager.getPad(randomPadId); | ||
| await pad.copyPadWithoutHistory(padID, true); | ||
| await pad.remove(); | ||
| } | ||
|
|
||
| const createRevision = async (aChangeset: AChangeSet, timestamp: number, isKeyRev: boolean, authorId: string, atext: any, pool: any) => { | ||
|
|
||
| if (authorId !== '') pool.putAttrib(['author', authorId]); | ||
|
|
||
| return { | ||
| changeset: aChangeset, | ||
| meta: { | ||
| author: authorId, | ||
| timestamp: timestamp, | ||
| ...isKeyRev ? { | ||
| pool: pool, | ||
| atext: atext, | ||
| } : {}, | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| exports.deleteRevisions = async (padId: string, keepRevisions: number): Promise<boolean> => { | ||
|
|
||
| logger.debug('Start cleanup revisions', padId) | ||
|
|
||
| let pad = await padManager.getPad(padId); | ||
| await pad.check() | ||
|
|
||
| logger.debug('Initial pad is valid') | ||
|
|
||
| if (pad.head <= keepRevisions) { | ||
| logger.debug('Pad has not enough revisions') | ||
| return false | ||
| } | ||
|
|
||
| padMessageHandler.kickSessionsFromPad(padId) | ||
|
|
||
| const cleanupUntilRevision = pad.head - keepRevisions | ||
| logger.debug('Composing changesets: ', cleanupUntilRevision) | ||
| const changeset = await padMessageHandler.composePadChangesets(pad, 0, cleanupUntilRevision + 1) | ||
|
|
||
| const revisions: Revision[] = []; | ||
|
|
||
| await promises.timesLimit(keepRevisions + 1, 500, async (i: number) => { | ||
| const rev = i + cleanupUntilRevision | ||
| revisions[rev] = await pad.getRevision(rev) | ||
| }); | ||
|
|
||
| logger.debug('Loaded revisions: ', revisions.length) | ||
|
|
||
| await promises.timesLimit(pad.head + 1, 500, async (i: string) => { | ||
| await db.remove(`pad:${padId}:revs:${i}`, null); | ||
| }); | ||
|
|
||
| let padContent = await db.get(`pad:${padId}`) | ||
| padContent.head = keepRevisions | ||
| if (padContent.savedRevisions) { | ||
| let newSavedRevisions = [] | ||
|
|
||
| for (let i = 0; i < padContent.savedRevisions.length; i++) { | ||
| if (padContent.savedRevisions[i].revNum > cleanupUntilRevision) { | ||
| padContent.savedRevisions[i].revNum = padContent.savedRevisions[i].revNum - cleanupUntilRevision | ||
| newSavedRevisions.push(padContent.savedRevisions[i]) | ||
| } | ||
| } | ||
| padContent.savedRevisions = newSavedRevisions | ||
| } | ||
| await db.set(`pad:${padId}`, padContent); | ||
|
|
||
| let newAText = Changeset.makeAText('\n'); | ||
| let pool = pad.apool() | ||
|
|
||
| newAText = Changeset.applyToAText(changeset, newAText, pool); | ||
|
|
||
| const revision = await createRevision( | ||
| changeset, | ||
| revisions[cleanupUntilRevision].meta.timestamp, | ||
| 0 === pad.getKeyRevisionNumber(0), | ||
| '', | ||
| newAText, | ||
| pool | ||
| ); | ||
|
|
||
| const p: Promise<void>[] = []; | ||
|
|
||
| p.push(db.set(`pad:${padId}:revs:0`, revision)) | ||
|
|
||
| p.push(promises.timesLimit(keepRevisions, 500, async (i: number) => { | ||
| const rev = i + cleanupUntilRevision + 1 | ||
| const newRev = rev - cleanupUntilRevision; | ||
|
|
||
| newAText = Changeset.applyToAText(revisions[rev].changeset, newAText, pool); | ||
|
|
||
| const revision = await createRevision( | ||
| revisions[rev].changeset, | ||
| revisions[rev].meta.timestamp, | ||
| newRev === pad.getKeyRevisionNumber(newRev), | ||
| revisions[rev].meta.author, | ||
| newAText, | ||
| pool | ||
| ); | ||
|
|
||
| await db.set(`pad:${padId}:revs:${newRev}`, revision); | ||
| })); | ||
|
|
||
| await Promise.all(p) | ||
|
|
||
| logger.debug('Finished migration. Checking pad now') | ||
|
|
||
| padManager.unloadPad(padId); | ||
|
|
||
| let newPad = await padManager.getPad(padId); | ||
| await newPad.check(); | ||
|
|
||
| return true | ||
| } | ||
|
|
||
| exports.checkTodos = async () => { | ||
| await new Promise(resolve => setTimeout(resolve, 5000)); | ||
|
|
||
| // TODO: Move to settings | ||
| const settings = { | ||
| minHead: 100, | ||
| keepRevisions: 100, | ||
| minAge: 1,//1000 * 60 * 60 * 24, | ||
| } | ||
|
|
||
| await Promise.all((await padManager.listAllPads()).padIDs.map(async (padId: string) => { | ||
| // TODO: Handle concurrency | ||
| const pad = await padManager.getPad(padId); | ||
|
|
||
| const revisionDate = await pad.getRevisionDate(pad.getHeadRevisionNumber()) | ||
|
|
||
| if (pad.head < settings.minHead || padMessageHandler.padUsersCount(padId) > 0 || Date.now() < revisionDate + settings.minAge) { | ||
| return | ||
| } | ||
|
|
||
| try { | ||
| const result = await exports.deleteRevisions(padId, settings.keepRevisions) | ||
| if (result) { | ||
| logger.info('successful cleaned up pad: ', padId) | ||
| } | ||
| } catch (err: any) { | ||
| logger.error(`Error in pad ${padId}: ${err.stack || err}`); | ||
| return; | ||
| } | ||
| })); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters