ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we always switch to a kernel that exists in the session manager (#4015)

Browse Source 
* Ensure we always switch to a kernel that exists in the session manager

* PR feedback, create new helper method
This commit is contained in:
Chris LaFreniere
2019-02-12 12:46:58 -10:00
committed by GitHub
parent 0aa71b5237
commit 9ebf1436d2
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sql/parts/notebook/models/notebookModel.ts
View File

@@ -427,6 +427,11 @@ export class NotebookModel extends Disposable implements INotebookModel {
public doChangeKernel(kernelSpec: nb.IKernelSpec): Promise<void> { public doChangeKernel(kernelSpec: nb.IKernelSpec): Promise<void> {
this.setProviderIdForKernel(kernelSpec); this.setProviderIdForKernel(kernelSpec);
// Ensure that the kernel we try to switch to is a valid kernel; if not, use the default
let kernelSpecs = this.getKernelSpecs();
if (kernelSpecs && kernelSpecs.length > 0 && kernelSpecs.findIndex(k => k.name === kernelSpec.name) < 0) {
kernelSpec = kernelSpecs.find(spec => spec.name === this.notebookManager.sessionManager.specs.defaultKernel);
}
if (this._activeClientSession && this._activeClientSession.isReady) { if (this._activeClientSession && this._activeClientSession.isReady) {
return this._activeClientSession.changeKernel(kernelSpec) return this._activeClientSession.changeKernel(kernelSpec)
.then((kernel) => { .then((kernel) => {
@@ -673,13 +678,23 @@ export class NotebookModel extends Disposable implements INotebookModel {
// If no SessionManager exists, utilize passed in StandardKernels to see if we can intelligently set _providerId // If no SessionManager exists, utilize passed in StandardKernels to see if we can intelligently set _providerId
if (!sessionManagerFound) { if (!sessionManagerFound) {
let provider = this._kernelDisplayNameToNotebookProviderIds.get(kernelSpec.display_name); let provider = this._kernelDisplayNameToNotebookProviderIds.get(kernelSpec.display_name);
if (provider) { if (provider && provider !== this._providerId) {
this._providerId = provider; this._providerId = provider;
this._onProviderIdChanged.fire(this._providerId); this._onProviderIdChanged.fire(this._providerId);
} }
} }
} }
} }
// Get kernel specs from current sessionManager
private getKernelSpecs(): nb.IKernelSpec[] {
if (this.notebookManager && this.notebookManager.sessionManager && this.notebookManager.sessionManager.specs &&
this.notebookManager.sessionManager.specs.kernels) {
return this.notebookManager.sessionManager.specs.kernels;
}
return [];
}
/** /**
* Serialize the model to JSON. * Serialize the model to JSON.
*/ */