RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 00:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #31474 into master

Browse Source 
* refs/pull/31474/head:
	mgr/devicehealth: ensure we don't store empty objects

Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Sage Weil 2019-11-09 15:39:19 -06:00
commit 489ca8cf5d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pybind/mgr/devicehealth/module.py
View File

@ -316,7 +316,8 @@ class Module(MgrModule):
if raw_smart_data:
for device, raw_data in raw_smart_data.items():
data = self.extract_smart_features(raw_data)
self.put_device_metrics(ioctx, device, data)
if device and data:
self.put_device_metrics(ioctx, device, data)
ioctx.close()
return 0, "", ""
@ -341,7 +342,8 @@ class Module(MgrModule):
continue
did_device[device] = 1
data = self.extract_smart_features(raw_data)
self.put_device_metrics(ioctx, device, data)
if device and data:
self.put_device_metrics(ioctx, device, data)
ioctx.close()
return 0, "", ""
@ -360,7 +362,8 @@ class Module(MgrModule):
if raw_smart_data:
for device, raw_data in raw_smart_data.items():
data = self.extract_smart_features(raw_data)
self.put_device_metrics(ioctx, device, data)
if device and data:
self.put_device_metrics(ioctx, device, data)
ioctx.close()
return 0, "", ""
@ -385,6 +388,7 @@ class Module(MgrModule):
daemon_type, daemon_id, outb))
def put_device_metrics(self, ioctx, devid, data):
assert devid
old_key = datetime.utcnow() - timedelta(
seconds=int(self.retention_period))
prune = old_key.strftime(TIME_FORMAT)