Skip to content

fix: memory leak in storageMainService #317841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SimonSiefke wants to merge 3 commits into
base: main
Choose a base branch
from
+16 −3
Open

fix: memory leak in storageMainService #317841

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9207a57
fix: memory leak in storageMainService
SimonSiefke May 21, 2026
84b88a6
Potential fix for pull request finding
SimonSiefke May 21, 2026
d69fd79
Merge branch 'main' into fix/memory-leak-storage-main-service-2
SimonSiefke May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/vs/platform/storage/electron-main/storageMainService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { AbstractStorageService, isProfileUsingDefaultStorage, IStorageService,
import { ApplicationStorageMain, ApplicationSharedStorageMain, ProfileStorageMain, InMemoryStorageMain, IStorageMain, IStorageMainOptions, WorkspaceStorageMain, IStorageChangeEvent } from './storageMain.js';
import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
import { IUserDataProfilesMainService } from '../../userDataProfile/electron-main/userDataProfile.js';
import { IAnyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
import { IAnyWorkspaceIdentifier, toWorkspaceIdentifier } from '../../workspace/common/workspace.js';
import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
import { Schemas } from '../../../base/common/network.js';

Expand Down Expand Up @@ -131,6 +131,19 @@ export class StorageMainService extends Disposable implements IStorageMainServic
if (e.workspace) {
this.workspaceStorage(e.workspace).init();
}

Event.once(Event.any(e.window.onDidClose, e.window.onDidDestroy))(async () => {
if (this.shutdownReason) {
return;
}
if (e.window.profile && this.mapProfileToStorage.has(e.window.profile.id)) {
await this.profileStorage(e.window.profile).close();
}
const actualWorkspace = e.workspace ?? e.window.openedWorkspace ?? toWorkspaceIdentifier(e.window.backupPath, e.window.isExtensionDevelopmentHost);
if (actualWorkspace && this.mapWorkspaceToStorage.has(actualWorkspace.id)) {
await this.workspaceStorage(actualWorkspace).close();
}
Comment thread
SimonSiefke marked this conversation as resolved.
});
Comment thread
SimonSiefke marked this conversation as resolved.
}));

// All Storage: Close when shutting down
Expand Down Expand Up @@ -230,7 +243,7 @@ export class StorageMainService extends Disposable implements IStorageMainServic
if (!profileStorage) {
this.logService.trace(`StorageMainService: creating profile storage (${profile.name})`);

profileStorage = this._register(this.createProfileStorage(profile));
profileStorage = this.createProfileStorage(profile);
Comment thread
SimonSiefke marked this conversation as resolved.
this.mapProfileToStorage.set(profile.id, profileStorage);

// Don't use this._register() for listeners that are disposed early
Expand Down Expand Up @@ -277,7 +290,7 @@ export class StorageMainService extends Disposable implements IStorageMainServic
if (!workspaceStorage) {
this.logService.trace(`StorageMainService: creating workspace storage (${workspace.id})`);

workspaceStorage = this._register(this.createWorkspaceStorage(workspace));
workspaceStorage = this.createWorkspaceStorage(workspace);
Comment thread
SimonSiefke marked this conversation as resolved.
this.mapWorkspaceToStorage.set(workspace.id, workspaceStorage);

// Don't use this._register() for Event.once as it auto-disposes
Expand Down