Skip to content

Improve error messages when vdi_type is missing #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 3.2.12-8.3
Choose a base branch
from
+13 −9
Open

Improve error messages when vdi_type is missing #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions drivers/LVHDSR.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,9 @@ def updateSRMetadata(self, allocation):
for vdi in self.session.xenapi.SR.get_VDIs(self.sr_ref):
vdi_uuid = self.session.xenapi.VDI.get_uuid(vdi)

if not self.session.xenapi.VDI.get_sm_config(vdi).get('vdi_type'):
raise xs_errors.XenError('MetadataError', opterr=f"Missing `vdi_type` for VDI {vdi_uuid}")

# Create the VDI entry in the SR metadata
vdi_info[vdi_uuid] = \
{
Expand Down
19 changes: 10 additions & 9 deletions drivers/srmetadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Functions to read and write SR metadata
#

from sm_typing import ClassVar, override
from sm_typing import Tuple, ClassVar, override

from abc import abstractmethod

Expand Down Expand Up @@ -138,11 +138,11 @@ def file_read_wrapper(fd, offset, bytesToRead=METADATA_BLK_SIZE):
([fd, offset, bytesToRead], e.errno))


def to_utf8(s):
def to_utf8(s: str) -> bytes:
return s.encode("utf-8")


def from_utf8(bs):
def from_utf8(bs: bytes) -> str:
return bs.decode("utf-8")


Expand Down Expand Up @@ -182,13 +182,14 @@ def buildHeader(length, major=metadata.MD_MAJOR, minor=metadata.MD_MINOR):
+ str(minor))


def unpackHeader(header):
vals = from_utf8(header).split(HEADER_SEP)
def unpackHeader(header: bytes) -> Tuple[str, str, str, str]:
decoded = from_utf8(header)
if len(decoded.rstrip('\x00')) == 0:
raise xs_errors.XenError('MetadataError', opterr='Empty header')
vals = decoded.split(HEADER_SEP)
if len(vals) != 4 or vals[0] != metadata.HDR_STRING:
util.SMlog("Exception unpacking metadata header: "
"Error: Bad header '%s'" % (header))
raise xs_errors.XenError('MetadataError', \
opterr='Bad header')
util.SMlog(f"Exception unpacking metadata header: Error: Bad header {header!r}")
raise xs_errors.XenError('MetadataError', opterr='Bad header')
return (vals[0], vals[1], vals[2], vals[3])


Expand Down