storage - do not unlink backups when backup fails

Benjamin Pasero · Benjamin Pasero · commit 4c68f7f3946c · 2019-01-08T10:34:33.000+01:00
diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts
@@ -77,12 +77,6 @@ export function unlink(path: string): Promise<void> {
 	return nfcall(fs.unlink, path);
 }
 
-export function unlinkIgnoreError(path: string): Promise<void> {
-	return new Promise(resolve => {
-		fs.unlink(path, () => resolve());
-	});
-}
-
 export function symlink(target: string, path: string, type?: string): Promise<void> {
 	return nfcall<void>(fs.symlink, target, path, type);
 }
diff --git a/src/vs/base/node/storage.ts b/src/vs/base/node/storage.ts
@@ -11,7 +11,7 @@ import { isUndefinedOrNull } from 'vs/base/common/types';
 import { mapToString, setToString } from 'vs/base/common/map';
 import { basename } from 'path';
 import { mark } from 'vs/base/common/performance';
-import { rename, unlinkIgnoreError, copy, renameIgnoreError } from 'vs/base/node/pfs';
+import { rename, copy, renameIgnoreError } from 'vs/base/node/pfs';
 
 export enum StorageHint {
 
@@ -440,7 +440,7 @@ export class SQLiteStorageDatabase implements IStorageDatabase {
 
 		const backupPath = this.toBackupPath(db.path);
 
-		return unlinkIgnoreError(backupPath).then(() => copy(db.path, backupPath));
+		return copy(db.path, backupPath);
 	}
 
 	private toBackupPath(path: string): string {
diff --git a/src/vs/base/test/node/pfs.test.ts b/src/vs/base/test/node/pfs.test.ts
@@ -119,23 +119,6 @@ suite('PFS', () => {
 		});
 	});
 
-	test('unlinkIgnoreError', function () {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'extfs', id);
-
-		return pfs.mkdirp(newDir, 493).then(() => {
-			return pfs.unlinkIgnoreError(path.join(newDir, 'foo')).then(() => {
-
-				return pfs.del(parentDir, os.tmpdir());
-			}, error => {
-				assert.fail(error);
-
-				return Promise.reject(error);
-			});
-		});
-	});
-
 	test('moveIgnoreError', function () {
 		const id = uuid.generateUuid();
 		const parentDir = path.join(os.tmpdir(), 'vsctests', id);

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,6 @@ export function unlink(path: string): Promise<void> {`
`77`	`77`	`return nfcall(fs.unlink, path);`
`78`	`78`	`}`
`79`	`79`
`80`		`-export function unlinkIgnoreError(path: string): Promise<void> {`
`81`		`- return new Promise(resolve => {`
`82`		`- fs.unlink(path, () => resolve());`
`83`		`- });`
`84`		`-}`
`85`		`-`
`86`	`80`	`export function symlink(target: string, path: string, type?: string): Promise<void> {`
`87`	`81`	`return nfcall<void>(fs.symlink, target, path, type);`
`88`	`82`	`}`