development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19537 from Microsoft/tyriar_16509

Browse source 
Perform hot exit backup/discard operations in a queue
This commit is contained in:
Benjamin Pasero 2017-02-20 13:48:45 +04:00 committed by GitHub
parent 138d02013a 812c63a28d
commit a5b8c44a13
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/vs/workbench/services/backup/node/backupFileService.ts
View file

@ -10,6 +10,7 @@ import * as crypto from 'crypto';
import pfs = require('vs/base/node/pfs'); import pfs = require('vs/base/node/pfs');
import * as platform from 'vs/base/common/platform'; import * as platform from 'vs/base/common/platform';
import Uri from 'vs/base/common/uri'; import Uri from 'vs/base/common/uri';
import { Queue } from 'vs/base/common/async';
import { IBackupFileService, BACKUP_FILE_UPDATE_OPTIONS } from 'vs/workbench/services/backup/common/backup'; import { IBackupFileService, BACKUP_FILE_UPDATE_OPTIONS } from 'vs/workbench/services/backup/common/backup';
import { IBackupService } from 'vs/platform/backup/common/backup'; import { IBackupService } from 'vs/platform/backup/common/backup';
import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@ -97,6 +98,11 @@ export class BackupFileService implements IBackupFileService {
private isShuttingDown: boolean; private isShuttingDown: boolean;
private backupWorkspacePath: string; private backupWorkspacePath: string;
private ready: TPromise<IBackupFilesModel>; private ready: TPromise<IBackupFilesModel>;
/**
* Ensure IO operations on individual files are performed in order, this could otherwise lead
* to unexpected behavior when backups are persisted and discarded in the wrong order.
*/
private ioOperationQueues: { [path: string]: Queue<void> };
constructor( constructor(
@IEnvironmentService private environmentService: IEnvironmentService, @IEnvironmentService private environmentService: IEnvironmentService,
@ -106,6 +112,7 @@ export class BackupFileService implements IBackupFileService {
) { ) {
this.isShuttingDown = false; this.isShuttingDown = false;
this.ready = this.init(windowService.getCurrentWindowId()); this.ready = this.init(windowService.getCurrentWindowId());
this.ioOperationQueues = {};
} }
private get backupEnabled(): boolean { private get backupEnabled(): boolean {
@ -173,7 +180,9 @@ export class BackupFileService implements IBackupFileService {
// Add metadata to top of file // Add metadata to top of file
content = `${resource.toString()}${BackupFileService.META_MARKER}${content}`; content = `${resource.toString()}${BackupFileService.META_MARKER}${content}`;
return this.fileService.updateContent(backupResource, content, BACKUP_FILE_UPDATE_OPTIONS).then(() => model.add(backupResource, versionId)); return this.getResourceIOQueue(backupResource).queue(() => {
return this.fileService.updateContent(backupResource, content, BACKUP_FILE_UPDATE_OPTIONS).then(() => model.add(backupResource, versionId));
});
}); });
} }
@ -184,10 +193,25 @@ export class BackupFileService implements IBackupFileService {
return void 0; return void 0;
} }
return pfs.del(backupResource.fsPath).then(() => model.remove(backupResource)); return this.getResourceIOQueue(backupResource).queue(() => {
return pfs.del(backupResource.fsPath).then(() => model.remove(backupResource));
});
}); });
} }
private getResourceIOQueue(resource: Uri) {
const key = resource.toString();
if (!this.ioOperationQueues[key]) {
const queue = new Queue<void>();
queue.onFinished(() => {
queue.dispose();
delete this.ioOperationQueues[key];
});
this.ioOperationQueues[key] = queue;
}
return this.ioOperationQueues[key];
}
public discardAllWorkspaceBackups(): TPromise<void> { public discardAllWorkspaceBackups(): TPromise<void> {
this.isShuttingDown = true; this.isShuttingDown = true;