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

Use sync callback to stop Jupyter server when ADS process exits (#24501)

Browse Source
This commit is contained in:
Cory Rivera
2023-09-22 08:50:05 -07:00
committed by GitHub
parent b79381d88e
commit f7f5ee780a
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/notebook/src/common/utils.ts
View File

@@ -52,6 +52,10 @@ export function executeBufferedCommand(cmd: string, options: childProcess.ExecOp
}); });
} }
export function executeBufferedCommandSync(cmd: string, options: childProcess.ExecOptions): string {
return childProcess.execSync(cmd, options).toString();
}
export function executeStreamedCommand(cmd: string, options: childProcess.SpawnOptions, outputChannel?: vscode.OutputChannel): Thenable<void> { export function executeStreamedCommand(cmd: string, options: childProcess.SpawnOptions, outputChannel?: vscode.OutputChannel): Thenable<void> {
return new Promise<void>((resolve, reject) => { return new Promise<void>((resolve, reject) => {
// Start the command // Start the command

28
extensions/notebook/src/jupyter/serverInstance.ts
View File

@@ -142,6 +142,30 @@ export class PerFolderServerInstance implements IServerInstance {
} }
} }
private stopSync(): void {
try {
this._isStopping = true;
if (this.baseDir) {
let exists = fs.pathExistsSync(this.baseDir);
if (exists) {
fs.removeSync(this.baseDir);
}
}
if (this._isStarted) {
let install = this.options.install;
let stopCommand = `"${install.pythonExecutable}" "${this.notebookScriptPath}" stop ${this._port}`;
utils.executeBufferedCommandSync(stopCommand, install.execOptions);
}
} catch (error) {
// For now, we don't care as this is non-critical
this.notify(this.options.install, localize('serverStopError', "Error stopping Notebook Server: {0}", utils.getErrorMessage(error)));
} finally {
this._isStarted = false;
ensureProcessEnded(this.childProcess);
this.handleConnectionClosed();
}
}
private async configureJupyter(): Promise<void> { private async configureJupyter(): Promise<void> {
this.createInstanceFolders(); this.createInstanceFolders();
let resourcesFolder = path.join(this.options.install.extensionPath, 'resources', constants.jupyterConfigRootFolder); let resourcesFolder = path.join(this.options.install.extensionPath, 'resources', constants.jupyterConfigRootFolder);
@@ -269,7 +293,9 @@ export class PerFolderServerInstance implements IServerInstance {
this.childProcess.addListener('error', this.handleConnectionError); this.childProcess.addListener('error', this.handleConnectionError);
this.childProcess.addListener('exit', this.handleConnectionClosed); this.childProcess.addListener('exit', this.handleConnectionClosed);
process.addListener('exit', this.stop); // Have to use the synchronous Stop callback for Exit events since it's required in the Node.JS docs: https://nodejs.org/api/process.html#event-exit
// The process exits immediately after calling the Stop callback, so if execution is yielded with an await, then any code after that isn't run.
process.addListener('exit', this.stopSync);
// TODO #897 covers serializing stdout and stderr to a location where we can read from so that user can see if they run into trouble // TODO #897 covers serializing stdout and stderr to a location where we can read from so that user can see if they run into trouble
} }