Skip to content

Fix jupyter server startup hang when xeus-cling is installed #7773

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
Oct 4, 2019
Merged

Fix jupyter server startup hang when xeus-cling is installed #7773

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
297fa2a
Fix jupyter server startup hang when xeus-cling is installed
rchiodo Oct 4, 2019
907159e
Merge remote-tracking branch 'origin/master' into rchiodo/fix_interpr…
rchiodo Oct 4, 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/7569.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix jupyter server startup hang when xeus-cling kernel is installed.
21 changes: 17 additions & 4 deletions src/client/common/process/pythonProcess.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import { injectable } from 'inversify';
import * as path from 'path';

import { IServiceContainer } from '../../ioc/types';
import { EXTENSION_ROOT_DIR } from '../constants';
import { ErrorUtils } from '../errors/errorUtils';
import { ModuleNotInstalledError } from '../errors/moduleNotInstalledError';
import { traceError } from '../logger';
import { IFileSystem } from '../platform/types';
import { waitForPromise } from '../utils/async';
import { Architecture } from '../utils/platform';
import { parsePythonVersion } from '../utils/version';
import { ExecutionResult, InterpreterInfomation, IProcessService, IPythonExecutionService, ObservableExecutionResult, PythonVersionInfo, SpawnOptions } from './types';
import {
ExecutionResult,
InterpreterInfomation,
IProcessService,
IPythonExecutionService,
ObservableExecutionResult,
PythonVersionInfo,
SpawnOptions
} from './types';

@injectable()
export class PythonExecutionService implements IPythonExecutionService {
Expand All @@ -28,8 +37,12 @@ export class PythonExecutionService implements IPythonExecutionService {
public async getInterpreterInformation(): Promise<InterpreterInfomation | undefined> {
const file = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'interpreterInfo.py');
try {
const jsonValue = await this.procService.exec(this.pythonPath, [file], { mergeStdOutErr: true })
.then(output => output.stdout.trim());
// Sometimes the python path isn't valid, timeout if that's the case.
// See these two bugs:
// https://github.com/microsoft/vscode-python/issues/7569
// https://github.com/microsoft/vscode-python/issues/7760
const jsonValue = await waitForPromise(this.procService.exec(this.pythonPath, [file], { mergeStdOutErr: true }), 5000)
.then(output => output ? output.stdout.trim() : '--timed out--'); // --timed out-- should cause an exception

let json: { versionInfo: PythonVersionInfo; sysPrefix: string; sysVersion: string; is64Bit: boolean };
try {
Expand Down