Skip to content

Commit

Permalink
Port timeout fix to release (#9003)
Browse files Browse the repository at this point in the history
  • Loading branch information
IanMatthewHuff authored Feb 11, 2022
1 parent 07ca167 commit 5c30ad5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

1. Fix daemon startup to work for non direct kernel cases
([#8995](https://github.com/Microsoft/vscode-jupyter/issues/8995))
1. Fix our waiting for RequestKernelInfo (might have been hurting raw kernel start some).
([#8989](https://github.com/Microsoft/vscode-jupyter/issues/8989))

### Thanks

Expand Down
2 changes: 1 addition & 1 deletion src/client/datascience/raw-kernel/rawJupyterSession.ts
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ export class RawJupyterSession extends BaseJupyterSession {
try {
await Promise.race([
Promise.all([result.kernel.requestKernelInfo(), gotIoPubMessage.promise]),
sleep(Math.min(this.launchTimeout, 10)),
sleep(Math.min(this.launchTimeout, 10_000)),
createPromiseFromCancellation({ cancelAction: 'reject', token: options.token })
]);
} catch (ex) {
Expand Down

0 comments on commit 5c30ad5

Please sign in to comment.