Adam Litke has uploaded a new change for review. Change subject: FileVolumeMetadata: split getMetadata ......................................................................
FileVolumeMetadata: split getMetadata Change-Id: I1d3fb61831de5b50a3e562b80bf38ef15ede254f Signed-off-by: Adam Litke <ali...@redhat.com> --- M vdsm/storage/fileVolume.py 1 file changed, 16 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/69/44569/1 diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py index 08e3f50..74aa911 100644 --- a/vdsm/storage/fileVolume.py +++ b/vdsm/storage/fileVolume.py @@ -123,18 +123,10 @@ """ return (self.getVolumePath(),) - def getMetadata(self, metaId=None): - """ - Get Meta data array of key,values lines - """ - if not metaId: - metaId = self.getMetadataId() - - volPath, = metaId - metaPath = self._getMetaVolumePath(volPath) - + @classmethod + def read_metadata(cls, oop, meta_path): try: - f = self.oop.directReadLines(metaPath) + f = oop.directReadLines(meta_path) out = {} for l in f: if l.startswith("EOF"): @@ -145,11 +137,22 @@ out[key.strip()] = value.strip() except Exception as e: - self.log.error(e, exc_info=True) - raise se.VolumeMetadataReadError("%s: %s" % (metaId, e)) + cls.log.error(e, exc_info=True) + raise se.VolumeMetadataReadError("%s: %s" % (meta_path, e)) return out + def getMetadata(self, metaId=None): + """ + Get Meta data array of key,values lines + """ + if not metaId: + metaId = self.getMetadataId() + + volPath, = metaId + metaPath = self._getMetaVolumePath(volPath) + return self.read_metadata(self.oop, metaPath) + def getParentId(self): """ Return parent volume UUID -- To view, visit https://gerrit.ovirt.org/44569 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d3fb61831de5b50a3e562b80bf38ef15ede254f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <ali...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches