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

Added new WebhookKernelSessionManager for Kernel Persistence #1101

Merged
merged 9 commits into from
Jun 10, 2022
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
23 changes: 23 additions & 0 deletions docs/source/operators/config-cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,29 @@ FileKernelSessionManager(KernelSessionManager) options
reside. This directory should exist. (EG_PERSISTENCE_ROOT env var)
Default: ''

WebhookKernelSessionManager(KernelSessionManager) options
---------------------------------------------------------
--WebhookKernelSessionManager.enable_persistence=<Bool>
Enable kernel session persistence (True or False). Default = False
(EG_KERNEL_SESSION_PERSISTENCE env var)
Default: False
--WebhookKernelSessionManager.persistence_root=<Unicode>
Identifies the root 'directory' under which the 'kernel_sessions' node will
reside. This directory should exist. (EG_PERSISTENCE_ROOT env var)
Default: ''
amazingarman marked this conversation as resolved.
Show resolved Hide resolved
--WebhookKernelSessionManager.webhook_url=<Unicode>
URL endpoint for webhook kernel session manager
Default: ''
--WebhookKernelSessionManager.auth_type=<Unicode>
Authentication type for webhook kernel session manager API. Either Basic, Digest or None
Default: ''
--WebhookKernelSessionManager.webhook_username=<Unicode>
Username for webhook kernel session manager API auth
Default: ''
--WebhookKernelSessionManager.webhook_password=<Unicode>
Password for webhook kernel session manager API auth
Default: ''

RemoteMappingKernelManager(AsyncMappingKernelManager) options
-------------------------------------------------------------
--RemoteMappingKernelManager.allowed_message_types=<list-item-1>...
Expand Down
39 changes: 39 additions & 0 deletions docs/source/operators/config-kernel-persistence.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Kernel Session Persistence

Enabling kernel session persistence allows Jupyter Notebooks to reconnect to kernels when Enterprise Gateway is restarted. There are two ways of persisting kernel sessions: _File Kernel Session Persistence_ and _Webhook Kernel Session Persistence_.

NOTE: Kernel Session Persistence should be considered experimental!

## File Kernel Session Persistence

File Kernel Session Persistence stores all kernel sessions as a file in a specified directory. To enable this, set the environment variable `EG_KERNEL_SESSION_PERSISTENCE=True` or configure `FileKernelSessionManager.enable_persistence=True`. To change the directory in which the kernel session file is being saved, either set the environment variable `EG_PERSISTENCE_ROOT` or configure `FileKernelSessionManager.persistence_root` to the directory.

## Webhook Kernel Session Persistence

Webhook Kernel Session Persistence stores all kernel sessions to any database. In order for this to work, an API must be created. The API must include four endpoints:

- A GET that will retrieve a list of all kernel sessions from a database
- A GET that will take the kernel id as a path variable and retrieve that information from a database
- A DELETE that will delete all kernel sessions, where the body of the request is a list of kernel ids
- A POST that will take kernel id as a path variable and kernel session in the body of the request and save it to a database where the object being saved is:

```
{
kernel_id: KERNEL ID,
kernel: KERNEL SESSION OBJECT
}
amazingarman marked this conversation as resolved.
Show resolved Hide resolved
```

To enable the webhook kernel session persistence, set the environment variable `EG_KERNEL_SESSION_PERSISTENCE=True` or configure `WebhookKernelSessionManager.enable_persistence=True`. To connect the API, set the environment varible `EG_WEBHOOK_URL` or configure `WebhookKernelSessionManager.webhook_url` to the API endpoint.

### Enabling Authentication

Enabling authentication is an option if the API requries it for requests. Set the environment variable `EG_AUTH_TYPE` or configure `WebhookKernelSessionManager.auth_type` to be either `Basic` or `Digest`. If it is set to an empty string authentication won't be enabled.

Then set the environment variables `EG_WEBHOOK_USERNAME` and `EG_WEBHOOK_PASSWORD` or configure `WebhookKernelSessionManager.webhook_username` and `WebhookKernelSessionManager.webhook_password` to provide the username and password for authentication.

## Testing Kernel Session Persistence

Once kernel session persistence has been enabled and configured, create a kernel by opening up a Jupyter Notebook. Save some variable in that notebook and shutdown Enterprise Gateway using `kill -9 PID`, wher `PID` is the PID of gateway. Restart Enterprise Gateway and refresh you notebook tab. If all worked correctly, the variable should be loaded without the need to rerun the cell.

If you are using docker, ensure the container isn't tied to the PID of Enterprise Gateway. The container should still run after killing that PID.
1 change: 1 addition & 0 deletions docs/source/operators/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,5 @@ Jupyter Enterprise Gateway adheres to
config-kernel-override
config-dynamic
config-culling
config-kernel-persistence
config-security
12 changes: 10 additions & 2 deletions enterprise_gateway/enterprisegatewayapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
default_handlers as default_kernelspec_handlers,
)
from .services.sessions.handlers import default_handlers as default_session_handlers
from .services.sessions.kernelsessionmanager import FileKernelSessionManager
from .services.sessions.kernelsessionmanager import (
FileKernelSessionManager,
WebhookKernelSessionManager,
)
from .services.sessions.sessionmanager import SessionManager

try:
Expand Down Expand Up @@ -77,7 +80,12 @@ class EnterpriseGatewayApp(EnterpriseGatewayConfigMixin, JupyterApp):
"""

# Also include when generating help options
classes = [KernelSpecCache, FileKernelSessionManager, RemoteMappingKernelManager]
classes = [
KernelSpecCache,
FileKernelSessionManager,
WebhookKernelSessionManager,
RemoteMappingKernelManager,
]

# Enable some command line shortcuts
aliases = aliases
Expand Down
142 changes: 142 additions & 0 deletions enterprise_gateway/services/sessions/kernelsessionmanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
import os
import threading

import requests
from jupyter_core.paths import jupyter_data_dir
from requests.auth import HTTPBasicAuth, HTTPDigestAuth
from traitlets import Bool, Unicode, default
from traitlets.config.configurable import LoggingConfigurable

Expand Down Expand Up @@ -385,3 +387,143 @@ def _get_sessions_loc(self):
if not os.path.exists(path):
os.makedirs(path, 0o755)
return path


class WebhookKernelSessionManager(KernelSessionManager):
"""
Performs kernel session persistence operations against URL provided (EG_WEBHOOK_URL). The URL must have 4 endpoints
associated with it. 1 delete endpoint that takes a list of kernel ids in the body, 1 post endpoint that takes kernels id as a
url param and the kernel session as the body, 1 get endpoint that returns all kernel sessions, and 1 get endpoint that returns
a specific kernel session based on kernel id as url param.
"""

# Webhook URL
webhook_url_env = "EG_WEBHOOK_URL"
webhook_url = Unicode(
config=True,
help="""URL endpoint for webhook kernel session manager""",
)

@default("webhook_url")
def webhook_url_default(self):
return os.getenv(self.webhook_url_env, "")

# Webhook Username
webhook_username_env = "EG_WEBHOOK_USERNAME"
webhook_username = Unicode(
config=True,
help="""Username for webhook kernel session manager API auth""",
)

@default("webhook_username")
def webhook_username_default(self):
return os.getenv(self.webhook_username_env, "")

# Webhook Password
webhook_password_env = "EG_WEBHOOK_PASSWORD"
webhook_password = Unicode(
config=True,
help="""Password for webhook kernel session manager API auth""",
)

@default("webhook_password")
def webhook_password_default(self):
return os.getenv(self.webhook_password_env, "")
amazingarman marked this conversation as resolved.
Show resolved Hide resolved

# Auth Type
auth_type_env = "EG_AUTH_TYPE"
auth_type = Unicode(
config=True,
help="""Authentication type for webhook kernel session manager API. Either Basic, Digest or None""",
)

@default("auth_type")
def auth_type_default(self):
return os.getenv(self.auth_type_env, "")
amazingarman marked this conversation as resolved.
Show resolved Hide resolved

def __init__(self, kernel_manager, **kwargs):
super().__init__(kernel_manager, **kwargs)
if self.enable_persistence:
self.log.info("Webhook kernel session persistence activated")
self.auth = ""
if self.auth_type:
if self.webhook_username and self.webhook_password:
if self.auth_type.lower() == "basic":
self.auth = HTTPBasicAuth(self.webhook_username, self.webhook_password)
elif self.auth_type.lower() == "digest":
self.auth = HTTPDigestAuth(self.webhook_username, self.webhook_password)
elif self.auth_type.lower() == "none":
self.auth = ""
else:
self.log.error("No such option for auth_type/EG_AUTH_TYPE")
else:
self.log.error("Username and/or password aren't set")

def delete_sessions(self, kernel_ids):
"""
Deletes kernel sessions from database

:param list of strings kernel_ids: A list of kernel ids
"""
if self.enable_persistence:
response = requests.delete(self.webhook_url, auth=self.auth, json=kernel_ids)
self.log.debug(f"Webhook kernel session deleting: {kernel_ids}")
if response.status_code != 204:
self.log.error(response.raise_for_status())

def save_session(self, kernel_id):
"""
Saves kernel session to database

:param string kernel_id: A kernel id
"""
if self.enable_persistence:
if kernel_id is not None:
temp_session = dict()
temp_session[kernel_id] = self._sessions[kernel_id]
body = KernelSessionManager.pre_save_transformation(temp_session)
response = requests.post(
f"{self.webhook_url}/{kernel_id}", auth=self.auth, json=body
)
self.log.debug(f"Webhook kernel session saving: {kernel_id}")
if response.status_code != 204:
self.log.error(response.raise_for_status())

def load_sessions(self):
"""
Loads kernel sessions from database
"""
if self.enable_persistence:
response = requests.get(self.webhook_url, auth=self.auth)
if response.status_code == 200:
kernel_sessions = response.content
for kernel_session in kernel_sessions:
self._load_session_from_file(kernel_session)
amazingarman marked this conversation as resolved.
Show resolved Hide resolved
else:
self.log.error(response.raise_for_status())

def load_session(self, kernel_id):
"""
Loads a kernel session from database

:param string kernel_id: A kernel id
"""
if self.enable_persistence:
if kernel_id is not None:
response = requests.get(f"{self.webhook_url}/{kernel_id}", auth=self.auth)
if response.status_code == 200:
kernel_session = response.content
self._load_session_from_file(kernel_session)
amazingarman marked this conversation as resolved.
Show resolved Hide resolved
else:
self.log.error(response.raise_for_status())

def _load_session_from_response(self, kernel):
"""
Loads kernel session to current session

:param dictionary kernel: Kernel session information
"""
self.log.debug("Loading saved session(s)")
self._sessions.update(
KernelSessionManager.post_load_transformation(json.loads(kernel)["kernel"])
)
amazingarman marked this conversation as resolved.
Show resolved Hide resolved