From 4e6e0e20cc9b0d0463c8846230edb713f0bffdfc Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 24 Jul 2017 21:08:36 -0400 Subject: [PATCH] mgr/dashboard: initial RBD iSCSI integration Signed-off-by: Jason Dillaman --- src/pybind/mgr/dashboard/base.html | 6 ++ src/pybind/mgr/dashboard/module.py | 30 +++++++ src/pybind/mgr/dashboard/rbd_iscsi.html | 104 ++++++++++++++++++++++++ src/pybind/mgr/dashboard/rbd_iscsi.py | 54 ++++++++++++ 4 files changed, 194 insertions(+) create mode 100644 src/pybind/mgr/dashboard/rbd_iscsi.html create mode 100644 src/pybind/mgr/dashboard/rbd_iscsi.py diff --git a/src/pybind/mgr/dashboard/base.html b/src/pybind/mgr/dashboard/base.html index 270491a49779..1d4947c26de3 100644 --- a/src/pybind/mgr/dashboard/base.html +++ b/src/pybind/mgr/dashboard/base.html @@ -372,6 +372,12 @@ +
  • + + iSCSI + + +
  • Pools diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py index 7e2a4260a03e..23b297ab195a 100644 --- a/src/pybind/mgr/dashboard/module.py +++ b/src/pybind/mgr/dashboard/module.py @@ -32,6 +32,7 @@ from types import OsdMap, NotFound, Config, FsMap, MonMap, \ PgSummary, Health, MonStatus import rados +import rbd_iscsi import rbd_mirroring from rbd_ls import RbdLs, RbdPoolLs from cephfs_clients import CephFSClients @@ -83,6 +84,9 @@ class Module(MgrModule): # pools self.rbd_pool_ls = RbdPoolLs(self) + # Stateful instance of RbdISCSI + self.rbd_iscsi = rbd_iscsi.Controller(self) + # Stateful instance of RbdMirroring, hold cached results. self.rbd_mirroring = rbd_mirroring.Controller(self) @@ -624,6 +628,32 @@ class Module(MgrModule): def rbd_mirroring_data(self): return self._rbd_mirroring() + def _rbd_iscsi(self): + status, data = global_instance().rbd_iscsi.content_data.get() + if data is None: + log.warning("Failed to get RBD iSCSI status") + return {} + return data + + @cherrypy.expose + def rbd_iscsi(self): + template = env.get_template("rbd_iscsi.html") + + toplevel_data = self._toplevel_data() + content_data = self._rbd_iscsi() + + return template.render( + ceph_version=global_instance().version, + path_info=cherrypy.request.path_info, + toplevel_data=json.dumps(toplevel_data, indent=2), + content_data=json.dumps(content_data, indent=2) + ) + + @cherrypy.expose + @cherrypy.tools.json_out() + def rbd_iscsi_data(self): + return self._rbd_iscsi() + @cherrypy.expose def health(self): template = env.get_template("health.html") diff --git a/src/pybind/mgr/dashboard/rbd_iscsi.html b/src/pybind/mgr/dashboard/rbd_iscsi.html new file mode 100644 index 000000000000..105f5dec8aa5 --- /dev/null +++ b/src/pybind/mgr/dashboard/rbd_iscsi.html @@ -0,0 +1,104 @@ +{% extends "base.html" %} + +{% block content %} + + + + +
    +

    + Block iSCSI +

    +
    + +
    +
    +
    +

    Daemons

    +
    +
    + + + + + + + + + + + + + + + + + +
    Hostname# Active/Optimized# Active/Non-OptimizedVersion
    {daemon.server_hostname}{daemon.optimized_paths}{daemon.non_optimized_paths}{daemon.version | short_version}
    +
    +
    + +
    +
    +

    Images

    +
    +
    + + + + + + + + + + + + + + + + + +
    PoolImageActive/OptimizedActive/Non-Optimized
    {image.pool_name}{image.name}{image.optimized_paths}{image.non_optimized_paths}
    +
    +
    +
    + + +{% endblock %} diff --git a/src/pybind/mgr/dashboard/rbd_iscsi.py b/src/pybind/mgr/dashboard/rbd_iscsi.py new file mode 100644 index 000000000000..9e0fda6223dd --- /dev/null +++ b/src/pybind/mgr/dashboard/rbd_iscsi.py @@ -0,0 +1,54 @@ + +import rados +import rbd +from remote_view_cache import RemoteViewCache + +SERVICE_TYPE = 'tcmu-runner' + +class DaemonsAndImages(RemoteViewCache): + def _get(self): + daemons = {} + images = {} + for server in self._module.list_servers(): + for service in server['services']: + if service['type'] == SERVICE_TYPE: + metadata = self._module.get_metadata(SERVICE_TYPE, + service['id']) + status = self._module.get_daemon_status(SERVICE_TYPE, + service['id']) + + daemon = daemons.get(server['hostname'], None) + if daemon is None: + daemon = { + 'server_hostname': server['hostname'], + 'version': metadata['ceph_version'], + 'optimized_paths': 0, + 'non_optimized_paths': 0 + } + daemons[server['hostname']] = daemon + + image = images.get(service['id']) + if image is None: + image = { + 'id': service['id'], + 'pool_name': metadata['pool_name'], + 'name': metadata['image_name'], + 'optimized_paths': [], + 'non_optimized_paths': [] + } + if status.get('lock_owner', 'false') == 'true': + daemon['optimized_paths'] += 1 + image['optimized_paths'].append(server['hostname']) + else: + daemon['non_optimized_paths'] += 1 + image['non_optimized_paths'].append(server['hostname']) + images[service['id']] = image + + return { + 'daemons': [daemons[k] for k in sorted(daemons, key=daemons.get)], + 'images': [images[k] for k in sorted(images, key=images.get)] + } + +class Controller: + def __init__(self, module_inst): + self.content_data = DaemonsAndImages(module_inst) -- 2.47.3