From 7f5dd385b51258fd0c9952578b91fee87689340e Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 3 Nov 2023 23:50:31 -0400 Subject: [PATCH] Use right key for FSID elsewhere --- daemon-common/ceph.py | 2 +- node-daemon/pvcnoded/objects/CephInstance.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon-common/ceph.py b/daemon-common/ceph.py index ca84d458..d59c58d2 100644 --- a/daemon-common/ceph.py +++ b/daemon-common/ceph.py @@ -210,7 +210,7 @@ def getClusterOSDList(zkhandler): def getOSDInformation(zkhandler, osd_id): # Get the devices - osd_fsid = zkhandler.read(("osd.fsid", osd_id)) + osd_fsid = zkhandler.read(("osd.ofsid", osd_id)) osd_node = zkhandler.read(("osd.node", osd_id)) osd_device = zkhandler.read(("osd.device", osd_id)) osd_is_split = bool(strtobool(zkhandler.read(("osd.is_split", osd_id)))) diff --git a/node-daemon/pvcnoded/objects/CephInstance.py b/node-daemon/pvcnoded/objects/CephInstance.py index 7eb51e77..1152da2c 100644 --- a/node-daemon/pvcnoded/objects/CephInstance.py +++ b/node-daemon/pvcnoded/objects/CephInstance.py @@ -475,7 +475,7 @@ class CephOSDInstance(object): (("osd.node", osd_id), node), (("osd.device", osd_id), device), (("osd.db_device", osd_id), db_device), - (("osd.fsid", osd_id), osd_fsid), + (("osd.fsid", osd_id), ""), (("osd.ofsid", osd_id), osd_fsid), (("osd.cfsid", osd_id), osd_clusterfsid), (("osd.lvm", osd_id), ""),