Skip to content

Make sure to leave the loop if switching works. #9239

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 1 commit into from
Dec 20, 2019
Merged

Make sure to leave the loop if switching works. #9239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/client/datascience/interactive-common/interactiveBase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,10 +1322,10 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
await this.switchKernelWithRetry(kernel);
}
}
private async switchKernelWithRetry(kernel: KernelSpecInterpreter){
private async switchKernelWithRetry(kernel: KernelSpecInterpreter) {
const settings = this.configuration.getSettings();
const isLocalConnection = this.notebook?.server.getConnectionInfo()?.localLaunch ?? settings.datascience.jupyterServerURI.toLowerCase() === Settings.JupyterServerLocalLaunch;
if (!isLocalConnection){
if (!isLocalConnection) {
return this.switchKernel(kernel);
}

Expand All @@ -1336,6 +1336,7 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
while (true) {
try {
await this.switchKernel(kernel);
break;
Copy link

Choose a reason for hiding this comment

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

F***... Thanks

} catch (ex) {
if (ex instanceof JupyterSessionStartError && isLocalConnection) {
// Looks like we were unable to start a session for the local connection.
Expand All @@ -1348,7 +1349,7 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
const selection = await this.applicationShell.showErrorMessage(message, selectKernel, cancel);
if (selection === selectKernel) {
kernel = await this.dataScience.selectLocalJupyterKernel(kernel.kernelSpec || kernel.kernelModel);
if (Object.keys(kernel).length > 0){
if (Object.keys(kernel).length > 0) {
continue;
}
}
Expand Down