mgr/cephadm: incorporte memory_{usage,request,limit} from 'ls'

Keep this in our cached inventory.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit ab63356f4682588017174a1590707c56f5c429d0)

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index cd8b76a574939ab567313d6ff9d4beb49a43d582..527b85d34b0b2e74199b99a1aafafc67793d8319 100644 (file)
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -271,6 +271,9 @@ class CephadmServe:
             sd.container_image_name = d.get('container_image_name')
             sd.container_image_id = d.get('container_image_id')
             sd.container_image_digests = d.get('container_image_digests')
+            sd.memory_usage = d.get('memory_usage')
+            sd.memory_request = d.get('memory_request')
+            sd.memory_limit = d.get('memory_limit')
             sd.version = d.get('version')
             if sd.daemon_type == 'osd':
                 sd.osdspec_affinity = self.mgr.osd_service.get_osdspec_affinity(sd.daemon_id)

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index e7dd12e6f272a5a28f91da8810215fb7be3e24cf..1f881f9e2dcf8fc210837b4587ab683de57eb3b4 100644 (file)
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -1293,7 +1293,11 @@ class DaemonDescription(object):
                  osdspec_affinity: Optional[str] = None,
                  last_deployed: Optional[datetime.datetime] = None,
                  events: Optional[List['OrchestratorEvent']] = None,
-                 is_active: bool = False) -> None:
+                 is_active: bool = False,
+                 memory_usage: Optional[int] = None,
+                 memory_request: Optional[int] = None,
+                 memory_limit: Optional[int] = None,
+                 ) -> None:
 
         # Host is at the same granularity as InventoryHost
         self.hostname: Optional[str] = hostname
@@ -1339,6 +1343,10 @@ class DaemonDescription(object):
 
         self.events: List[OrchestratorEvent] = events or []
 
+        self.memory_usage: Optional[int] = memory_usage
+        self.memory_request: Optional[int] = memory_request
+        self.memory_limit: Optional[int] = memory_limit
+
         self.is_active = is_active
 
     def name(self) -> str:
@@ -1422,6 +1430,9 @@ class DaemonDescription(object):
         out['container_image_id'] = self.container_image_id
         out['container_image_name'] = self.container_image_name
         out['container_image_digests'] = self.container_image_digests
+        out['memory_usage'] = self.memory_usage
+        out['memory_request'] = self.memory_request
+        out['memory_limit'] = self.memory_limit
         out['version'] = self.version
         out['status'] = self.status.value if self.status is not None else None
         out['status_desc'] = self.status_desc