development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #208324 (#212822)

Browse source
This commit is contained in:
Sandeep Somavarapu 2024-05-15 18:11:37 +02:00 committed by GitHub
parent bd653ce6c9
commit b8881656c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/vs/platform/userDataSync/common/userDataSyncService.ts
View file

@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { equals } from 'vs/base/common/arrays';
import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
import { CancelablePromise, createCancelablePromise, RunOnceScheduler } from 'vs/base/common/async';
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
import { toErrorMessage } from 'vs/base/common/errorMessage';
import { Emitter, Event } from 'vs/base/common/event';
@ -98,6 +98,8 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
this._status = userDataSyncStoreManagementService.userDataSyncStore ? SyncStatus.Idle : SyncStatus.Uninitialized;
this._lastSyncTime = this.storageService.getNumber(LAST_SYNC_TIME_KEY, StorageScope.APPLICATION, undefined);
this._register(toDisposable(() => this.clearActiveProfileSynchronizers()));
this._register(new RunOnceScheduler(() => this.cleanUpStaleStorageData(), 5 * 1000 /* after 5s */)).schedule();
}
async createSyncTask(manifest: IUserDataManifest | null, disableCache?: boolean): Promise<IUserDataSyncTask> {
@ -245,6 +247,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
if (this.userDataProfilesService.profiles.some(p => p.id === profileSynchronizerItem[0].profile.id)) {
continue;
}
await profileSynchronizerItem[0].resetLocal();
profileSynchronizerItem[1].dispose();
this.activeProfileSynchronizers.delete(key);
}
@ -397,6 +400,46 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
this.logService.info('Did reset the local sync state.');
}
private async cleanUpStaleStorageData(): Promise<void> {
const allKeys = this.storageService.keys(StorageScope.APPLICATION, StorageTarget.MACHINE);
const lastSyncProfileKeys: [string, string][] = [];
for (const key of allKeys) {
if (!key.endsWith('.lastSyncUserData')) {
continue;
}
const segments = key.split('.');
if (segments.length === 3) {
lastSyncProfileKeys.push([key, segments[0]]);
}
}
if (!lastSyncProfileKeys.length) {
return;
}
const disposables = new DisposableStore();
try {
let defaultProfileSynchronizer = this.activeProfileSynchronizers.get(this.userDataProfilesService.defaultProfile.id)?.[0];
if (!defaultProfileSynchronizer) {
defaultProfileSynchronizer = disposables.add(this.instantiationService.createInstance(ProfileSynchronizer, this.userDataProfilesService.defaultProfile, undefined));
}
const userDataProfileManifestSynchronizer = defaultProfileSynchronizer.enabled.find(s => s.resource === SyncResource.Profiles) as UserDataProfilesManifestSynchroniser;
if (!userDataProfileManifestSynchronizer) {
return;
}
const lastSyncedProfiles = await userDataProfileManifestSynchronizer.getLastSyncedProfiles();
const lastSyncedCollections = lastSyncedProfiles?.map(p => p.collection) ?? [];
for (const [key, collection] of lastSyncProfileKeys) {
if (!lastSyncedCollections.includes(collection)) {
this.logService.info(`Removing last sync state for stale profile: ${collection}`);
this.storageService.remove(key, StorageScope.APPLICATION);
}
}
} finally {
disposables.dispose();
}
}
async cleanUpRemoteData(): Promise<void> {
const remoteProfiles = await this.userDataSyncResourceProviderService.getRemoteSyncedProfiles();
const remoteProfileCollections = remoteProfiles.map(profile => profile.collection);