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

Fix pending kernels again #845

Merged
merged 2 commits into from
Oct 11, 2022

Conversation

blink1073
Copy link
Contributor

@blink1073 blink1073 commented Oct 6, 2022

  • Make the ready promise less timing-sensitive.
  • Separate out a shutdown_ready promise.
  • Always return concurrent future in synchronous manager and asyncio future in async manager.

@blink1073 blink1073 added the bug label Oct 6, 2022
@blink1073 blink1073 added this to the 8.0 milestone Oct 6, 2022
@blink1073
Copy link
Contributor Author

Server fix in jupyter-server/jupyter_server#1014

@Zsailer
Copy link
Member

Zsailer commented Oct 10, 2022

This is slick! Thanks, @blink1073!

@Zsailer
Copy link
Member

Zsailer commented Oct 10, 2022

As discussed, that's backport this to 7.x and release, since this fixes a bug in the pending kernels API.

@blink1073 blink1073 merged commit c33e6b6 into jupyter:main Oct 11, 2022
@blink1073 blink1073 deleted the fix-pending-kernels-again branch October 11, 2022 13:22
@blink1073
Copy link
Contributor Author

@meeseeksdev please backport to 7.x

@lumberbot-app
Copy link

lumberbot-app bot commented Oct 11, 2022

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 7.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 c33e6b6cc3ebbed1e1a963dbe049599717f6a41b
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #845: Fix pending kernels again'
  1. Push to a named branch:
git push YOURFORK 7.x:auto-backport-of-pr-845-on-7.x
  1. Create a PR against branch 7.x, I would have named this PR:

"Backport PR #845 on branch 7.x (Fix pending kernels again)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants