From 17d6a993fc17d533460c5f40f3908c708e057c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 23 May 2024 18:45:17 +0200 Subject: Merging upstream version 18.2.3. Signed-off-by: Daniel Baumann --- src/pybind/mgr/devicehealth/module.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/pybind/mgr/devicehealth/module.py') diff --git a/src/pybind/mgr/devicehealth/module.py b/src/pybind/mgr/devicehealth/module.py index 07768db75..e4356175c 100644 --- a/src/pybind/mgr/devicehealth/module.py +++ b/src/pybind/mgr/devicehealth/module.py @@ -327,6 +327,11 @@ CREATE TABLE DeviceHealthMetrics ( count += 1 except json.decoder.JSONDecodeError: pass + except rados.ObjectNotFound: + # https://tracker.ceph.com/issues/63882 + # Sometimes an object appears in the pool listing but cannot be interacted with? + self.log.debug(f"object {obj} does not exist because it is deleted in HEAD") + pass if count >= 10: break done = count < 10 @@ -502,8 +507,8 @@ CREATE TABLE DeviceHealthMetrics ( def put_device_metrics(self, devid: str, data: Any) -> None: SQL = """ - INSERT INTO DeviceHealthMetrics (devid, raw_smart) - VALUES (?, ?); + INSERT OR REPLACE INTO DeviceHealthMetrics (devid, raw_smart, time) + VALUES (?, ?, strftime('%s', 'now')); """ with self._db_lock, self.db: -- cgit v1.2.3