mgr/cephadm: add ceph volume to metadata agent reports

Signed-off-by: Adam King <adking@redhat.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 2e4b0224f54371e2c0ce3effbf696abf03474631..b7af2573c51e6d7552bf34c3013fe31bb877c85f 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -3540,6 +3540,7 @@ class CephadmAgent():
         self.ack = -1
         self.event = threading.Event()
         self.mgr_listener = MgrListener(self)
+        self.device_enhanced_scan = False
 
     def deploy_daemon_unit(self, config: Dict[str, str] = {}) -> None:
         if not config:
@@ -3611,6 +3612,7 @@ WantedBy=ceph-{fsid}.target
                 self.loop_interval = int(config['refresh_period'])
                 starting_port = int(config['listener_port'])
                 self.host = config['host']
+                use_lsm = config['device_enhanced_scan']
         except Exception as e:
             self.shutdown()
             raise Error(f'Failed to get agent target ip and port from config: {e}')
@@ -3624,6 +3626,10 @@ WantedBy=ceph-{fsid}.target
 
         assert self.target_ip and self.target_port
 
+        self.device_enhanced_scan = False
+        if use_lsm.lower() == 'true':
+            self.device_enhanced_scan = True
+
         try:
             for _ in range(1001):
                 if not port_in_use(self.ctx, starting_port):
@@ -3646,10 +3652,17 @@ WantedBy=ceph-{fsid}.target
         while not self.stop:
             ack = self.ack
 
+            try:
+                volume = self._ceph_volume(self.device_enhanced_scan)
+            except Exception as e:
+                logger.error(f'Failed to get ceph-volume metadata: {e}')
+                volume = ''
+
             data = json.dumps({'host': self.host,
                               'ls': list_daemons(self.ctx),
                                'networks': list_networks(self.ctx),
                                'facts': HostFacts(self.ctx).dump(),
+                               'volume': volume,
                                'ack': str(ack),
                                'keyring': self.keyring,
                                'port': self.listener_port})
@@ -3665,6 +3678,23 @@ WantedBy=ceph-{fsid}.target
             self.event.wait(self.loop_interval)
             self.event.clear()
 
+    def _ceph_volume(self, enhanced: bool = False) -> str:
+        self.ctx.command = 'inventory --format=json'.split()
+        if enhanced:
+            self.ctx.command.append('--with-lsm')
+        self.ctx.fsid = self.fsid
+
+        stream = io.StringIO()
+        with redirect_stdout(stream):
+            command_ceph_volume(self.ctx)
+
+        stdout = stream.getvalue()
+
+        if stdout:
+            return stdout
+        else:
+            raise Exception('ceph-volume returned empty value')
+
 
 def command_agent(ctx: CephadmContext) -> None:
     agent = CephadmAgent(ctx, ctx.fsid, ctx.daemon_id)

diff --git a/src/pybind/mgr/cephadm/agent.py b/src/pybind/mgr/cephadm/agent.py
index f7831c6fb3a6b0255a6a0eff0ef5ab4edbd73abb..abc56a1984c7ddd3f2b6f882334b9213a3e3ca5c 100644 (file)
--- a/src/pybind/mgr/cephadm/agent.py
+++ b/src/pybind/mgr/cephadm/agent.py
@@ -8,6 +8,7 @@ import time
 
 from mgr_util import verify_tls_files
 from ceph.utils import datetime_now
+from ceph.deployment.inventory import Devices
 from ceph.deployment.service_spec import ServiceSpec, PlacementSpec
 
 from OpenSSL import crypto
@@ -133,7 +134,7 @@ class HostData:
         except Exception as e:
             raise Exception(
                 f'Counter value from agent on host {host} could not be converted to an integer: {e}')
-        metadata_types = ['ls', 'networks', 'facts']
+        metadata_types = ['ls', 'networks', 'facts', 'volume']
         metadata_types_str = '{' + ', '.join(metadata_types) + '}'
         if not all(item in data.keys() for item in metadata_types):
             self.mgr.log.warning(
@@ -163,13 +164,16 @@ class HostData:
                 self.mgr.log.debug(
                     f'Received old metadata from agent on host {host}. Requested up-to-date metadata.')
 
-
-            if 'ls' in data:
+            if 'ls' in data and data['ls']:
                 self.mgr._process_ls_output(host, data['ls'])
-            if 'networks' in data:
+            if 'networks' in data and data['networks']:
                 self.mgr.cache.update_host_networks(host, data['networks'])
-            if 'facts' in data:
+            if 'facts' in data and data['facts']:
                 self.mgr.cache.update_host_facts(host, json.loads(data['facts']))
+            if 'volume' in data and data['volume']:
+                self.mgr.log.error(data['volume'])
+                ret = Devices.from_json(json.loads(data['volume']))
+                self.mgr.cache.update_host_devices(host, ret.devices)
 
             if up_to_date:
                 self.mgr.cache.metadata_up_to_date[host] = True
@@ -192,7 +196,7 @@ class AgentMessageThread(threading.Thread):
     def run(self) -> None:
         try:
             assert self.mgr.cherrypy_thread
-            root_cert= self.mgr.cherrypy_thread.ssl_certs.get_root_cert()
+            root_cert = self.mgr.cherrypy_thread.ssl_certs.get_root_cert()
             root_cert_tmp = tempfile.NamedTemporaryFile()
             root_cert_tmp.write(root_cert.encode('utf-8'))
             root_cert_tmp.flush()
@@ -220,7 +224,8 @@ class AgentMessageThread(threading.Thread):
         try:
             bytes_len: str = str(len(self.data.encode('utf-8')))
             if len(bytes_len.encode('utf-8')) > 10:
-                raise Exception(f'Message is too big to send to agent. Message size is {bytes_len} bytes!')
+                raise Exception(
+                    f'Message is too big to send to agent. Message size is {bytes_len} bytes!')
             while len(bytes_len.encode('utf-8')) < 10:
                 bytes_len = '0' + bytes_len
         except Exception as e:

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 8a5ff3de81d4b0f9f68230ffad4358b19e71b3e0..d393e7ad65be170f46aa168a432d13d9c8230612 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2275,7 +2275,8 @@ Then run the following:
             root_cert = ''
             if self.cherrypy_thread and self.cherrypy_thread.ssl_certs.root_cert:
                 root_cert = self.cherrypy_thread.ssl_certs.get_root_cert()
-            deps = [self.get_mgr_ip(), str(self.endpoint_port), root_cert]
+            deps = sorted([self.get_mgr_ip(), str(self.endpoint_port), root_cert,
+                          str(self.get_module_option('device_enhanced_scan'))])
         else:
             need = {
                 'prometheus': ['mgr', 'alertmanager', 'node-exporter', 'ingress'],

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index 4c76a9833345f5c444e3cf9fe284254070481627..7b1b432e431d3c0e77df9fbc8b3554e050326183 100644 (file)
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -306,6 +306,12 @@ class CephadmServe:
                     r = self._refresh_host_networks(host)
                     if r:
                         failures.append(r)
+
+                if self.mgr.cache.host_needs_device_refresh(host):
+                    self.log.debug('refreshing %s devices' % host)
+                    r = self._refresh_host_devices(host)
+                    if r:
+                        failures.append(r)
                 self.mgr.cache.metadata_up_to_date[host] = True
 
             if self.mgr.cache.host_needs_registry_login(host) and self.mgr.registry_url:
@@ -315,12 +321,6 @@ class CephadmServe:
                 if r:
                     bad_hosts.append(r)
 
-            if self.mgr.cache.host_needs_device_refresh(host):
-                self.log.debug('refreshing %s devices' % host)
-                r = self._refresh_host_devices(host)
-                if r:
-                    failures.append(r)
-
             if self.mgr.cache.host_needs_osdspec_preview_refresh(host):
                 self.log.debug(f"refreshing OSDSpec previews for {host}")
                 r = self._refresh_host_osdspec_previews(host)

diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py
index c1cda43032f8fd5c08cbdb2a39aea55d128689ba..43999e398a7e65ef894a10da23b589e699027d3f 100644 (file)
--- a/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@ -1023,7 +1023,8 @@ class CephadmAgent(CephService):
                'target_port': self.mgr.endpoint_port,
                'refresh_period': self.mgr.agent_refresh_rate,
                'listener_port': self.mgr.agent_starting_port,
-               'host': daemon_spec.host}
+               'host': daemon_spec.host,
+               'device_enhanced_scan': str(self.mgr.get_module_option('device_enhanced_scan'))}
 
         assert self.mgr.cherrypy_thread
         assert self.mgr.cherrypy_thread.ssl_certs.get_root_cert()
@@ -1038,4 +1039,4 @@ class CephadmAgent(CephService):
             'listener.key': listener_key,
         }
 
-        return config, sorted([str(self.mgr.get_mgr_ip()), str(self.mgr.endpoint_port), self.mgr.cherrypy_thread.ssl_certs.get_root_cert()])
+        return config, sorted([str(self.mgr.get_mgr_ip()), str(self.mgr.endpoint_port), self.mgr.cherrypy_thread.ssl_certs.get_root_cert(), str(self.mgr.get_module_option('device_enhanced_scan'))])