Skip to content
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.

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

Port NB2KG PRs to Gateway #4701

Merged
merged 3 commits into from
Jun 25, 2019
Merged

Conversation

kevin-bates
Copy link
Member

As the winds of a Notebook 6.0 release are blowing, we need to get some of the recent fixes in NB2KG into the Gateway module for Notebook since 6.0 marks the first release in which the extension is embedded in Notebook.

The ported changes are the following:

  1. Increase http timeout default values nb2kg#35, Ensure request-timeout is > launch-timeout + pad nb2kg#38: Modify/add various timeout values and ensure the request timeout is greater than the kernel launch timeout.
  2. Allow KG_HEADERS to specify Authorization without being overwritten  nb2kg#30: Add authorization token to header only if no authorization already present. @chuyqa - could you please confirm these changes are correct.
  3. Add keepalive websocket ping nb2kg#29: Add keepalive ping on gateway websocket. @esevan - could you please confirm these changes are correct.

Once Notebook 6.0 is available, we will move NB2KG into maintenance mode.

cc: @Zsailer - we'll want this PR included in the list at jupyter-server/jupyter_server#53. Thanks!

@lresende lresende mentioned this pull request Jun 20, 2019
@jasongrout jasongrout added this to the 6.0 milestone Jun 21, 2019
@jasongrout
Copy link
Member

Setting milestone 6 at @lresende's request

The connect and request timeout defaults have been updated from 20 to 60
seconds and a default value of 40 has been added for KERNEL_LAUNCH_TIMEOUT.
The code ensures that KERNEL_LAUNCH_TIMEOUT is in the env and that the
value of the request timeout is at least 2 greather than KERNEL_LAUNCH_TIMEOUT.

This PR is port of the NB2KG PRs 35 and 38.
Copy link
Member

@lresende lresende left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for porting these prs before the 6.0 release.

@lresende lresende merged commit f68e34f into jupyter:master Jun 25, 2019
@kevin-bates kevin-bates deleted the nb2kg-pr-port branch June 26, 2019 22:11
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 27, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants