Culling: ensure last_activity attr exists before use #5355
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KernelManager's last_activity attribute is added following the instance's creation. Culling (independently) uses this attribute and should ensure it exists prior to its use, else skip the culling check for that instance. Fixes jupyter#5345
29 tasks
akkim31
approved these changes
Dec 23, 2020
| @@ -459,9 +459,9 @@ async def cull_kernel_if_idle(self, kernel_id): | |||
| except KeyError: | |||
| return # KeyErrors are somewhat expected since the kernel can be shutdown as the culling check is made. | |||
| @@ -234,3 +235,49 @@ class KernelFilterTest(NotebookTestBase): | |||
| # Sanity check verifying that the configurable was properly set. | |||
| def test_config(self): | |||
| @@ -234,3 +235,49 @@ class KernelFilterTest(NotebookTestBase): | |||
| # Sanity check verifying that the configurable was properly set. | |||
| @@ -459,9 +459,9 @@ async def cull_kernel_if_idle(self, kernel_id): | |||
| except KeyError: | |||
| return # KeyErrors are somewhat expected since the kernel can be shutdown as the culling check is made. | |||
|
|
|||
| self.log.debug("kernel_id=%s, kernel_name=%s, last_activity=%s", | |||
| kernel_id, kernel.kernel_name, kernel.last_activity) | |||
| if kernel.last_activity is not None: | |||
urbas
reviewed
Jan 16, 2021
| def test_culling(self): | ||
| kid = self.kern_api.start().json()['id'] | ||
| ws = self.kern_api.websocket(kid) | ||
| model = self.kern_api.get(kid).json() |
There was a problem hiding this comment.
Heads-up: this test has a race condition. On slower hardware the kernel is already culled by the time the model is fetched and the assertion below fails. Example build failure: https://hydra.nixos.org/build/134833130
There was a problem hiding this comment.
Thank you Matej. Yeah, I raised this suspicion in the jupyter_server meeting the other day and believe 2 seconds is a bit short. I think extending the idle timeout to 5 seconds - given this is the only test like this - will be sufficient.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
KernelManager's last_activity attribute is added following the instance's
creation. Culling (independently) uses this attribute and should ensure
it exists prior to its use, else skip the culling check for that instance.
Fixes #5345