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

Improve logic used to wait for standard kernel registration (#18111)

Browse Source
This commit is contained in:
Cory Rivera
2022-01-18 16:01:25 -08:00
committed by GitHub
parent 51b0e9feee
commit b39025ddbb
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts
View File

@@ -353,8 +353,10 @@ export class NotebookService extends Disposable implements INotebookService {
this.addStandardKernels(registration); this.addStandardKernels(registration);
} else { } else {
// Standard kernels might get registered later for VSCode notebooks, so add a descriptor to wait on // Standard kernels might get registered later for VSCode notebooks, so add a descriptor to wait on
let descriptor = new StandardKernelsDescriptor(p.id); if (!this._providerToStandardKernels.has(p.id)) {
this._providerToStandardKernels.set(p.id.toUpperCase(), descriptor); let descriptor = new StandardKernelsDescriptor(p.id);
this._providerToStandardKernels.set(p.id.toUpperCase(), descriptor);
}
} }
// Emit activation event if the provider is not one of the default options // Emit activation event if the provider is not one of the default options
@@ -460,10 +462,15 @@ export class NotebookService extends Disposable implements INotebookService {
public async getStandardKernelsForProvider(provider: string): Promise<nb.IStandardKernel[] | undefined> { public async getStandardKernelsForProvider(provider: string): Promise<nb.IStandardKernel[] | undefined> {
let descriptor = this._providerToStandardKernels.get(provider.toUpperCase()); let descriptor = this._providerToStandardKernels.get(provider.toUpperCase());
let kernels: nb.IStandardKernel[] = undefined;
if (descriptor) { if (descriptor) {
return this.waitOnStandardKernelsAvailability(descriptor); if (descriptor.instance) {
kernels = descriptor.instance;
} else {
kernels = await this.waitOnStandardKernelsAvailability(descriptor);
}
} }
return undefined; return kernels;
} }
private shutdown(): void { private shutdown(): void {
@@ -647,8 +654,15 @@ export class NotebookService extends Disposable implements INotebookService {
} catch (error) { } catch (error) {
this._logService.error(error); this._logService.error(error);
} }
instance = await this.waitOnExecuteProviderAvailability(providerDescriptor, timeout);
if (instance) { if (providerDescriptor.instance) {
instance = providerDescriptor.instance;
} else {
instance = await this.waitOnExecuteProviderAvailability(providerDescriptor, timeout);
}
// Even if we have an execute provider, we still need standard kernels to be able to use it
if (instance && !kernelDescriptor.instance) {
let kernels = await this.waitOnStandardKernelsAvailability(kernelDescriptor, timeout); let kernels = await this.waitOnStandardKernelsAvailability(kernelDescriptor, timeout);
if (!kernels) { if (!kernels) {
instance = undefined; instance = undefined;
@@ -678,7 +692,9 @@ export class NotebookService extends Disposable implements INotebookService {
let promises: Promise<ISerializationProvider | undefined>[] = [ let promises: Promise<ISerializationProvider | undefined>[] = [
providerDescriptor.instanceReady, providerDescriptor.instanceReady,
new Promise<ISerializationProvider | undefined>((resolve, reject) => setTimeout(() => { new Promise<ISerializationProvider | undefined>((resolve, reject) => setTimeout(() => {
onUnexpectedError(localize('serializationProviderTimeout', 'Waiting for Serialization Provider availability timed out for notebook provider \'{0}\'', providerDescriptor.providerId)); if (!providerDescriptor.instance) {
onUnexpectedError(localize('serializationProviderTimeout', 'Waiting for Serialization Provider availability timed out for notebook provider \'{0}\'', providerDescriptor.providerId));
}
resolve(undefined); resolve(undefined);
}, timeout)) }, timeout))
]; ];
@@ -691,7 +707,9 @@ export class NotebookService extends Disposable implements INotebookService {
let promises: Promise<IExecuteProvider | undefined>[] = [ let promises: Promise<IExecuteProvider | undefined>[] = [
providerDescriptor.instanceReady, providerDescriptor.instanceReady,
new Promise<IExecuteProvider | undefined>((resolve, reject) => setTimeout(() => { new Promise<IExecuteProvider | undefined>((resolve, reject) => setTimeout(() => {
onUnexpectedError(localize('executeProviderTimeout', 'Waiting for Execute Provider availability timed out for notebook provider \'{0}\'', providerDescriptor.providerId)); if (!providerDescriptor.instance) {
onUnexpectedError(localize('executeProviderTimeout', 'Waiting for Execute Provider availability timed out for notebook provider \'{0}\'', providerDescriptor.providerId));
}
resolve(undefined); resolve(undefined);
}, timeout)) }, timeout))
]; ];
@@ -704,7 +722,9 @@ export class NotebookService extends Disposable implements INotebookService {
let promises: Promise<nb.IStandardKernel[] | undefined>[] = [ let promises: Promise<nb.IStandardKernel[] | undefined>[] = [
kernelsDescriptor.instanceReady, kernelsDescriptor.instanceReady,
new Promise<nb.IStandardKernel[] | undefined>((resolve, reject) => setTimeout(() => { new Promise<nb.IStandardKernel[] | undefined>((resolve, reject) => setTimeout(() => {
onUnexpectedError(localize('standardKernelsTimeout', 'Waiting for Standard Kernels availability timed out for notebook provider \'{0}\'', kernelsDescriptor.providerId)); if (!kernelsDescriptor.instance) {
onUnexpectedError(localize('standardKernelsTimeout', 'Waiting for Standard Kernels availability timed out for notebook provider \'{0}\'', kernelsDescriptor.providerId));
}
resolve(undefined); resolve(undefined);
}, timeout)) }, timeout))
]; ];