mgr/dashboard: incorporate RBD mirror image status listing

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/pybind/mgr/dashboard/rbd_mirroring.html b/src/pybind/mgr/dashboard/rbd_mirroring.html
index 3c53c3334f9257ea3a3c9cce2a0c56e4f7a2bda0..b83aadd08f40b1ff7c7d842da3e9e66450f25d63 100644 (file)
--- a/src/pybind/mgr/dashboard/rbd_mirroring.html
+++ b/src/pybind/mgr/dashboard/rbd_mirroring.html
@@ -151,13 +151,15 @@
                                 <th>Pool</th>
                                 <th>Image</th>
                                 <th>Issue</th>
+                                <th>State</th>
                             </tr>
                             </thead>
                             <tbody>
                                 <tr rv-each-image="image_error">
-                                    <td>{image.pool}</td>
+                                    <td>{image.pool_name}</td>
                                     <td>{image.name}</td>
                                     <td>{image.description}</td>
+                                    <td><span rv-class="image.state_color | mirror_health_color">{image.state}</span></td>
                                 </tr>
                             </tbody>
                         </table>
@@ -169,11 +171,12 @@
                                 <th>Pool</th>
                                 <th>Image</th>
                                 <th>Progress</th>
+                                <th>State</th>
                             </tr>
                             </thead>
                             <tbody>
                                 <tr rv-each-image="image_syncing">
-                                    <td>{image.pool}</td>
+                                    <td>{image.pool_name}</td>
                                     <td>{image.name}</td>
                                     <td>
                                         <div class="progress" style="width: 100px; height: 18px;">
@@ -182,6 +185,7 @@
                                             </div>
                                         </div>
                                     </td>
+                                    <td><span class="label label-info">Syncing</span></td>
                                 </tr>
                             </tbody>
                         </table>
@@ -192,13 +196,15 @@
                             <tr>
                                 <th>Pool</th>
                                 <th>Image</th>
+                                <th>Description</th>
                                 <th>State</th>
                             </tr>
                             </thead>
                             <tbody>
                                 <tr rv-each-image="image_ready">
-                                    <td>{image.pool}</td>
+                                    <td>{image.pool_name}</td>
                                     <td>{image.name}</td>
+                                    <td>{image.description}</td>
                                     <td><span rv-class="image.state_color | mirror_health_color">{image.state}</span></td>
                                 </tr>
                             </tbody>

diff --git a/src/pybind/mgr/dashboard/rbd_mirroring.py b/src/pybind/mgr/dashboard/rbd_mirroring.py
index a5019db4f74088b6bcc578179ab7845f91cfa689..99c3f1dadc3781c18fcb39e74a8d51c1cd70c59a 100644 (file)
--- a/src/pybind/mgr/dashboard/rbd_mirroring.py
+++ b/src/pybind/mgr/dashboard/rbd_mirroring.py
@@ -1,5 +1,6 @@
 
 import json
+import re
 import rados
 import rbd
 from remote_view_cache import RemoteViewCache
@@ -38,8 +39,8 @@ class PoolDatum(RemoteViewCache):
             self.log.exception("Failed to open pool " + pool_name)
             return None
 
+        rbdctx = rbd.RBD()
         try:
-            rbdctx = rbd.RBD()
             mirror_mode = rbdctx.mirror_mode_get(ioctx)
         except:
             self.log.exception("Failed to query mirror mode " + pool_name)
@@ -51,6 +52,56 @@ class PoolDatum(RemoteViewCache):
             mirror_mode = None
         data['mirror_mode'] = mirror_mode
 
+        mirror_state = {
+            rbd.MIRROR_IMAGE_STATUS_STATE_UNKNOWN: {
+                'health': 'issue',
+                'state_color': 'warning',
+                'state': 'Unknown',
+                'description': None
+            },
+            rbd.MIRROR_IMAGE_STATUS_STATE_ERROR: {
+                'health': 'issue',
+                'state_color': 'error',
+                'state': 'Error'
+            },
+            rbd.MIRROR_IMAGE_STATUS_STATE_SYNCING: {
+                'health': 'syncing'
+            },
+            rbd.MIRROR_IMAGE_STATUS_STATE_STARTING_REPLAY: {
+                'health': 'ok',
+                'state_color': 'success',
+                'state': 'Starting'
+            },
+            rbd.MIRROR_IMAGE_STATUS_STATE_REPLAYING: {
+                'health': 'ok',
+                'state_color': 'success',
+                'state': 'Replaying'
+            },
+            rbd.MIRROR_IMAGE_STATUS_STATE_STOPPING_REPLAY: {
+                'health': 'ok',
+                'state_color': 'success',
+                'state': 'Stopping'
+            },
+            rbd.MIRROR_IMAGE_STATUS_STATE_STOPPED: {
+                'health': 'ok',
+                'state_color': 'info',
+                'state': 'Primary'
+            }
+        }
+
+        try:
+            mirror_image_status = rbdctx.mirror_image_status_list(ioctx)
+            data['mirror_images'] = sorted([
+                dict({
+                    'name': image['name'],
+                    'description': image['description']
+                }, **mirror_state[rbd.MIRROR_IMAGE_STATUS_STATE_UNKNOWN if not image['up'] else image['state']])
+                for image in mirror_image_status
+            ], key=lambda k: k['name'])
+        except:
+            self.log.exception("Failed to list mirror image status " + self.pool_name)
+            return None
+
         return data
 
 class Toplevel(RemoteViewCache):
@@ -91,44 +142,66 @@ class ContentData(RemoteViewCache):
             for daemon in daemons
         ], key=lambda k: k['id'])
 
+        pools = []
+        image_error = []
+        image_syncing = []
+        image_ready = []
+        for pool_name in pool_names:
+            pool = self.get_pool_datum(pool_name)
+            if pool is None:
+                continue
+
+            for mirror_image in pool['mirror_images']:
+                image = {
+                    'pool_name': pool_name,
+                    'name': mirror_image['name']
+                }
+
+                if mirror_image['health'] == 'ok':
+                    image.update({
+                        'state_color': mirror_image['state_color'],
+                        'state': mirror_image['state'],
+                        'description': mirror_image['description']
+                    })
+                    image_ready.append(image)
+                elif mirror_image['health'] == 'syncing':
+                    p = re.compile("bootstrapping, IMAGE_COPY/COPY_OBJECT (.*)%")
+                    image.update({
+                        'progress': (p.findall(mirror_image['description']) or [0])[0]
+                    })
+                    image_syncing.append(image)
+                else:
+                    image.update({
+                        'state_color': mirror_image['state_color'],
+                        'state': mirror_image['state'],
+                        'description': mirror_image['description']
+                    })
+                    image_error.append(image)
 
-        pools = sorted([
-            {
+            pools.append({
                 'name': pool_name,
-                'mirror_mode': self.get_pool_mirror_mode(pool_name),
+                'mirror_mode': pool['mirror_mode'],
                 'health_color': 'error',
                 'health': 'Error'
-            }
-            for pool_name in pool_names
-        ], key=lambda k: k['name'])
+            })
+
 
         return {
             'daemons': daemons,
             'pools' : pools,
-            'image_error': [
-                {'pool': 'images', 'name': 'foo', 'description': "couldn't blah"},
-                {'pool': 'images', 'name': 'goo', 'description': "failed XYZ"}
-            ],
-            'image_syncing': [
-                {'pool': 'images', 'name': 'foo', 'progress': 93},
-                {'pool': 'images', 'name': 'goo', 'progress': 0}
-            ],
-            'image_ready': [
-                {'pool': 'images', 'name': 'foo', 'state_color': 'info', 'state': 'Primary'},
-                {'pool': 'images', 'name': 'goo', 'state_color': 'success', 'state': 'Mirroring'}
-            ]
+            'image_error': image_error,
+            'image_syncing': image_syncing,
+            'image_ready': image_ready
         }
 
-    def get_pool_mirror_mode(self, pool_name):
+    def get_pool_datum(self, pool_name):
         pool_datum = self.pool_data.get(pool_name, None)
         if pool_datum is None:
             pool_datum = PoolDatum(self._module, pool_name)
             self.pool_data[pool_name] = pool_datum
 
         status, value = pool_datum.get()
-        if value is None:
-            return None
-        return value.get('mirror_mode', None)
+        return value
 
 class Controller:
     def __init__(self, module_inst):