Skip to content

close restart session right away #7153

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

Merged
merged 2 commits into from
Aug 30, 2019
Merged

close restart session right away #7153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a6202a
close restart session right away
IanMatthewHuff Aug 29, 2019
277d904
ignore errors on await, don't want to stop and wait for shutdown
IanMatthewHuff Aug 29, 2019
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
1 change: 1 addition & 0 deletions news/2 Fixes/6975.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Delete the old session immediatly after session restart instead of on close
10 changes: 3 additions & 7 deletions src/client/datascience/jupyter/jupyterSession.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ export class JupyterSession implements IJupyterSession {
private statusHandler: Slot<Session.ISession, Kernel.Status> | undefined;
private connected: boolean = false;
private jupyterPasswordConnect: IJupyterPasswordConnect;
private oldSessions: Session.ISession[] = [];

constructor(
connInfo: IConnection,
Expand Down Expand Up @@ -124,8 +123,8 @@ export class JupyterSession implements IJupyterSession {
if (oldStatusHandler) {
oldSession.statusChanged.disconnect(oldStatusHandler);
}
// Don't shutdown old sessions yet. This seems to hang tests.
Copy link
Member Author

@IanMatthewHuff IanMatthewHuff Aug 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes me worry a bit, but I tried the tests locally with both mock and real jupyter and they all passed.

Copy link
Member Author

@IanMatthewHuff IanMatthewHuff Aug 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They might have issues on AzDO (I've seen that at times) but this code looks clearly wrong and we can always investigate a failing test later.

this.oldSessions.push(oldSession);

this.shutdownSession(oldSession, undefined).ignoreErrors();
} else {
throw new Error(localize.DataScience.sessionDisposed());
}
Expand Down Expand Up @@ -207,8 +206,7 @@ export class JupyterSession implements IJupyterSession {
traceInfo(`Error waiting for restart session: ${exc}`);
tryCount += 1;
if (result) {
// Cleanup later.
this.oldSessions.push(result);
this.shutdownSession(result, undefined).ignoreErrors();
}
result = undefined;
exception = exc;
Expand Down Expand Up @@ -375,8 +373,6 @@ export class JupyterSession implements IJupyterSession {
}
if (this.session || this.sessionManager) {
try {
traceInfo('ShutdownSessionAndConnection - old sessions');
await Promise.all(this.oldSessions.map(s => this.shutdownSession(s, undefined)));
traceInfo('ShutdownSessionAndConnection - current session');
await this.shutdownSession(this.session, this.statusHandler);
traceInfo('ShutdownSessionAndConnection - get restart session');
Expand Down