##// END OF EJS Templates
DEV: More checkpoint API refactoring....
DEV: More checkpoint API refactoring. Changed the public checkpoint API to: - `create_checkpoint(self, nb, path)` - `get_checkpoint_content(self, checkpoint_id, path)` - `rename_checkpoint(self, checkpoint_id, old_path, new_path)` - `delete_checkpoint(self, checkpoint_id, path)` - `list_checkpoints(self, path)` All paths in the above are API-style paths, and the `nb` argument to `create_checkpoint` is a dictionary suitable for passing to `nbformat.write`. The new `get_checkpoint_content` method returns an unvalidated notebook content dictionary. It is used by `ContentManager.restore_checkpoint` to load content to be written via `save`.

File last commit:

r18135:0d959525 merge
r19747:4b186626
Show More
clustermanager.py
162 lines | 5.6 KiB | text/x-python | PythonLexer
MinRK
remove deleted profiles from cluster list
r18118 """Manage IPython.parallel clusters in the notebook."""
Brian Granger
First version of cluster web service....
r6191
MinRK
remove deleted profiles from cluster list
r18118 # Copyright (c) IPython Development Team.
# Distributed under the terms of the Modified BSD License.
Brian Granger
First version of cluster web service....
r6191
from tornado import web
from IPython.config.configurable import LoggingConfigurable
MinRK
stop using deprecated DelayedCallback...
r18119 from IPython.utils.traitlets import Dict, Instance, Float
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 from IPython.core.profileapp import list_profiles_in
from IPython.core.profiledir import ProfileDir
Thomas Kluyver
Python 3 compatibility for os.getcwdu()
r13447 from IPython.utils import py3compat
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 from IPython.utils.path import get_ipython_dir
Brian Granger
First version of cluster web service....
r6191
class ClusterManager(LoggingConfigurable):
profiles = Dict()
MinRK
stop using deprecated DelayedCallback...
r18119 delay = Float(1., config=True,
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 help="delay (in s) between starting the controller and the engines")
loop = Instance('zmq.eventloop.ioloop.IOLoop')
def _loop_default(self):
from zmq.eventloop.ioloop import IOLoop
return IOLoop.instance()
def build_launchers(self, profile_dir):
MinRK
don’t import IPython.parallel until it’s used...
r17052 from IPython.parallel.apps.ipclusterapp import IPClusterStart
class DummyIPClusterStart(IPClusterStart):
"""Dummy subclass to skip init steps that conflict with global app.
Instantiating and initializing this class should result in fully configured
launchers, but no other side effects or state.
"""
def init_signal(self):
pass
def reinit_logging(self):
pass
MinRK
use DummyIPClusterStart to load config in notebook ClusterManager...
r6202 starter = DummyIPClusterStart(log=self.log)
starter.initialize(['--profile-dir', profile_dir])
cl = starter.controller_launcher
esl = starter.engine_launcher
n = starter.n
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 return cl, esl, n
def get_profile_dir(self, name, path):
p = ProfileDir.find_profile_dir_by_name(path,name=name)
return p.location
def update_profiles(self):
Brian Granger
First version of cluster web service....
r6191 """List all profiles in the ipython_dir and cwd.
"""
MinRK
remove deleted profiles from cluster list
r18118
stale = set(self.profiles)
Thomas Kluyver
Python 3 compatibility for os.getcwdu()
r13447 for path in [get_ipython_dir(), py3compat.getcwd()]:
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 for profile in list_profiles_in(path):
MinRK
remove deleted profiles from cluster list
r18118 if profile in stale:
stale.remove(profile)
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 pd = self.get_profile_dir(profile, path)
if profile not in self.profiles:
MinRK
remove deleted profiles from cluster list
r18118 self.log.debug("Adding cluster profile '%s'", profile)
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 self.profiles[profile] = {
'profile': profile,
'profile_dir': pd,
'status': 'stopped'
}
MinRK
remove deleted profiles from cluster list
r18118 for profile in stale:
# remove profiles that no longer exist
self.log.debug("Profile '%s' no longer exists", profile)
self.profiles.pop(stale)
Brian Granger
First version of cluster web service....
r6191
def list_profiles(self):
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 self.update_profiles()
MinRK
ensure 'default' is first in cluster profile list...
r11149 # sorted list, but ensure that 'default' always comes first
default_first = lambda name: name if name != 'default' else ''
result = [self.profile_info(p) for p in sorted(self.profiles, key=default_first)]
Brian Granger
First version of cluster web service....
r6191 return result
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 def check_profile(self, profile):
if profile not in self.profiles:
raise web.HTTPError(404, u'profile not found')
Brian Granger
First version of cluster web service....
r6191
def profile_info(self, profile):
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 self.check_profile(profile)
result = {}
Brian Granger
First version of cluster web service....
r6191 data = self.profiles.get(profile)
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 result['profile'] = profile
result['profile_dir'] = data['profile_dir']
result['status'] = data['status']
if 'n' in data:
Brian Granger
First version of cluster web service....
r6191 result['n'] = data['n']
return result
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 def start_cluster(self, profile, n=None):
Brian Granger
First version of cluster web service....
r6191 """Start a cluster for a given profile."""
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 self.check_profile(profile)
data = self.profiles[profile]
if data['status'] == 'running':
Brian Granger
First version of cluster web service....
r6191 raise web.HTTPError(409, u'cluster already running')
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 cl, esl, default_n = self.build_launchers(data['profile_dir'])
n = n if n is not None else default_n
def clean_data():
data.pop('controller_launcher',None)
data.pop('engine_set_launcher',None)
data.pop('n',None)
data['status'] = 'stopped'
def engines_stopped(r):
self.log.debug('Engines stopped')
if cl.running:
cl.stop()
clean_data()
esl.on_stop(engines_stopped)
def controller_stopped(r):
self.log.debug('Controller stopped')
if esl.running:
esl.stop()
clean_data()
cl.on_stop(controller_stopped)
MinRK
stop using deprecated DelayedCallback...
r18119 loop = self.loop
def start():
"""start the controller, then the engines after a delay"""
cl.start()
loop.add_timeout(self.loop.time() + self.delay, lambda : esl.start(n))
self.loop.add_callback(start)
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199
self.log.debug('Cluster started')
data['controller_launcher'] = cl
data['engine_set_launcher'] = esl
data['n'] = n
data['status'] = 'running'
Brian Granger
Cluster management is now working....
r6197 return self.profile_info(profile)
Brian Granger
First version of cluster web service....
r6191
def stop_cluster(self, profile):
"""Stop a cluster for a given profile."""
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 self.check_profile(profile)
data = self.profiles[profile]
if data['status'] == 'stopped':
Brian Granger
First version of cluster web service....
r6191 raise web.HTTPError(409, u'cluster not running')
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 data = self.profiles[profile]
cl = data['controller_launcher']
esl = data['engine_set_launcher']
if cl.running:
cl.stop()
if esl.running:
esl.stop()
# Return a temp info dict, the real one is updated in the on_stop
# logic above.
result = {
'profile': data['profile'],
'profile_dir': data['profile_dir'],
'status': 'stopped'
}
return result
Brian Granger
First version of cluster web service....
r6191
def stop_all_clusters(self):
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 for p in self.profiles.keys():
MinRK
small changes in response to pyflakes pass...
r6270 self.stop_cluster(p)