X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/9c793cfbdc4956a23121a93baaa6e80ff07ee12c..e1dcc53a1a3eb34e502dca68777a80710ece0a0d:/lib/bdev.py diff --git a/lib/bdev.py b/lib/bdev.py index 49fd3e3..f723021 100644 --- a/lib/bdev.py +++ b/lib/bdev.py @@ -31,6 +31,7 @@ import logging from ganeti import utils from ganeti import errors from ganeti import constants +from ganeti import objects def _IgnoreError(fn, *args, **kwargs): @@ -108,13 +109,14 @@ class BlockDev(object): after assembly we'll have our correct major/minor. """ - def __init__(self, unique_id, children): + def __init__(self, unique_id, children, size): self._children = children self.dev_path = None self.unique_id = unique_id self.major = None self.minor = None self.attached = False + self.size = size def Assemble(self): """Assemble the device from its components. @@ -160,7 +162,7 @@ class BlockDev(object): """Remove this device. This makes sense only for some of the device types: LV and file - storeage. Also note that if the device can't attach, the removal + storage. Also note that if the device can't attach, the removal can't be completed. """ @@ -227,12 +229,16 @@ class BlockDev(object): data. This is only valid for some devices, the rest will always return False (not degraded). - @rtype: tuple - @return: (sync_percent, estimated_time, is_degraded, ldisk) + @rtype: objects.BlockDevStatus """ - return None, None, False, False - + return objects.BlockDevStatus(dev_path=self.dev_path, + major=self.major, + minor=self.minor, + sync_percent=None, + estimated_time=None, + is_degraded=False, + ldisk_status=constants.LDS_OKAY) def CombinedSyncStatus(self): """Calculate the mirror status recursively for our children. @@ -241,22 +247,44 @@ class BlockDev(object): minimum percent and maximum time are calculated across our children. + @rtype: objects.BlockDevStatus + """ - min_percent, max_time, is_degraded, ldisk = self.GetSyncStatus() + status = self.GetSyncStatus() + + min_percent = status.sync_percent + max_time = status.estimated_time + is_degraded = status.is_degraded + ldisk_status = status.ldisk_status + if self._children: for child in self._children: - c_percent, c_time, c_degraded, c_ldisk = child.GetSyncStatus() + child_status = child.GetSyncStatus() + if min_percent is None: - min_percent = c_percent - elif c_percent is not None: - min_percent = min(min_percent, c_percent) + min_percent = child_status.sync_percent + elif child_status.sync_percent is not None: + min_percent = min(min_percent, child_status.sync_percent) + if max_time is None: - max_time = c_time - elif c_time is not None: - max_time = max(max_time, c_time) - is_degraded = is_degraded or c_degraded - ldisk = ldisk or c_ldisk - return min_percent, max_time, is_degraded, ldisk + max_time = child_status.estimated_time + elif child_status.estimated_time is not None: + max_time = max(max_time, child_status.estimated_time) + + is_degraded = is_degraded or child_status.is_degraded + + if ldisk_status is None: + ldisk_status = child_status.ldisk_status + elif child_status.ldisk_status is not None: + ldisk_status = max(ldisk_status, child_status.ldisk_status) + + return objects.BlockDevStatus(dev_path=self.dev_path, + major=self.major, + minor=self.minor, + sync_percent=min_percent, + estimated_time=max_time, + is_degraded=is_degraded, + ldisk_status=ldisk_status) def SetInfo(self, text): @@ -276,6 +304,23 @@ class BlockDev(object): """ raise NotImplementedError + def GetActualSize(self): + """Return the actual disk size. + + @note: the device needs to be active when this is called + + """ + assert self.attached, "BlockDevice not attached in GetActualSize()" + result = utils.RunCmd(["blockdev", "--getsize64", self.dev_path]) + if result.failed: + _ThrowError("blockdev failed (%s): %s", + result.fail_reason, result.output) + try: + sz = int(result.output.strip()) + except (ValueError, TypeError), err: + _ThrowError("Failed to parse blockdev output: %s", str(err)) + return sz + def __repr__(self): return ("<%s: unique_id: %s, children: %s, %s:%s, %s>" % (self.__class__, self.unique_id, self._children, @@ -286,19 +331,19 @@ class LogicalVolume(BlockDev): """Logical Volume block device. """ - def __init__(self, unique_id, children): + def __init__(self, unique_id, children, size): """Attaches to a LV device. The unique_id is a tuple (vg_name, lv_name) """ - super(LogicalVolume, self).__init__(unique_id, children) + super(LogicalVolume, self).__init__(unique_id, children, size) if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 2: raise ValueError("Invalid configuration data %s" % str(unique_id)) self._vg_name, self._lv_name = unique_id self.dev_path = "/dev/%s/%s" % (self._vg_name, self._lv_name) self._degraded = True - self.major = self.minor = None + self.major = self.minor = self.pe_size = self.stripe_count = None self.Attach() @classmethod @@ -318,18 +363,27 @@ class LogicalVolume(BlockDev): pvlist = [ pv[1] for pv in pvs_info ] free_size = sum([ pv[0] for pv in pvs_info ]) + current_pvs = len(pvlist) + stripes = min(current_pvs, constants.LVM_STRIPECOUNT) # The size constraint should have been checked from the master before # calling the create function. if free_size < size: _ThrowError("Not enough free space: required %s," " available %s", size, free_size) - result = utils.RunCmd(["lvcreate", "-L%dm" % size, "-n%s" % lv_name, - vg_name] + pvlist) + cmd = ["lvcreate", "-L%dm" % size, "-n%s" % lv_name] + # If the free space is not well distributed, we won't be able to + # create an optimally-striped volume; in that case, we want to try + # with N, N-1, ..., 2, and finally 1 (non-stripped) number of + # stripes + for stripes_arg in range(stripes, 0, -1): + result = utils.RunCmd(cmd + ["-i%d" % stripes_arg] + [vg_name] + pvlist) + if not result.failed: + break if result.failed: _ThrowError("LV create failed (%s): %s", result.fail_reason, result.output) - return LogicalVolume(unique_id, children) + return LogicalVolume(unique_id, children, size) @staticmethod def GetPVInfo(vg_name): @@ -401,19 +455,30 @@ class LogicalVolume(BlockDev): """ self.attached = False result = utils.RunCmd(["lvs", "--noheadings", "--separator=,", - "-olv_attr,lv_kernel_major,lv_kernel_minor", - self.dev_path]) + "--units=m", "--nosuffix", + "-olv_attr,lv_kernel_major,lv_kernel_minor," + "vg_extent_size,stripes", self.dev_path]) if result.failed: logging.error("Can't find LV %s: %s, %s", self.dev_path, result.fail_reason, result.output) return False - out = result.stdout.strip().rstrip(',') + # the output can (and will) have multiple lines for multi-segment + # LVs, as the 'stripes' parameter is a segment one, so we take + # only the last entry, which is the one we're interested in; note + # that with LVM2 anyway the 'stripes' value must be constant + # across segments, so this is a no-op actually + out = result.stdout.splitlines() + if not out: # totally empty result? splitlines() returns at least + # one line for any non-empty string + logging.error("Can't parse LVS output, no lines? Got '%s'", str(out)) + return False + out = out[-1].strip().rstrip(',') out = out.split(",") - if len(out) != 3: - logging.error("Can't parse LVS output, len(%s) != 3", str(out)) + if len(out) != 5: + logging.error("Can't parse LVS output, len(%s) != 5", str(out)) return False - status, major, minor = out[:3] + status, major, minor, pe_size, stripes = out if len(status) != 6: logging.error("lvs lv_attr is not 6 characters (%s)", status) return False @@ -424,8 +489,22 @@ class LogicalVolume(BlockDev): except ValueError, err: logging.error("lvs major/minor cannot be parsed: %s", str(err)) + try: + pe_size = int(float(pe_size)) + except (TypeError, ValueError), err: + logging.error("Can't parse vg extent size: %s", err) + return False + + try: + stripes = int(stripes) + except (TypeError, ValueError), err: + logging.error("Can't parse the number of stripes: %s", err) + return False + self.major = major self.minor = minor + self.pe_size = pe_size + self.stripe_count = stripes self._degraded = status[0] == 'v' # virtual volume, i.e. doesn't backing # storage self.attached = True @@ -434,7 +513,7 @@ class LogicalVolume(BlockDev): def Assemble(self): """Assemble the device. - We alway run `lvchange -ay` on the LV to ensure it's active before + We always run `lvchange -ay` on the LV to ensure it's active before use, as there were cases when xenvg was not active after boot (also possibly after disk issues). @@ -471,11 +550,21 @@ class LogicalVolume(BlockDev): The status was already read in Attach, so we just return it. - @rtype: tuple - @return: (sync_percent, estimated_time, is_degraded, ldisk) + @rtype: objects.BlockDevStatus """ - return None, None, self._degraded, self._degraded + if self._degraded: + ldisk_status = constants.LDS_FAULTY + else: + ldisk_status = constants.LDS_OKAY + + return objects.BlockDevStatus(dev_path=self.dev_path, + major=self.major, + minor=self.minor, + sync_percent=None, + estimated_time=None, + is_degraded=self._degraded, + ldisk_status=ldisk_status) def Open(self, force=False): """Make the device ready for I/O. @@ -500,7 +589,7 @@ class LogicalVolume(BlockDev): snap_name = self._lv_name + ".snap" # remove existing snapshot if found - snap = LogicalVolume((self._vg_name, snap_name), None) + snap = LogicalVolume((self._vg_name, snap_name), None, size) _IgnoreError(snap.Remove) pvs_info = self.GetPVInfo(self._vg_name) @@ -544,6 +633,13 @@ class LogicalVolume(BlockDev): """Grow the logical volume. """ + if self.pe_size is None or self.stripe_count is None: + if not self.Attach(): + _ThrowError("Can't attach to LV during Grow()") + full_stripe_size = self.pe_size * self.stripe_count + rest = amount % full_stripe_size + if rest != 0: + amount += full_stripe_size - rest # we try multiple algorithms since the 'best' ones might not have # space available in the right place, but later ones might (since # they have less constraints); also note that only recent LVM @@ -563,15 +659,56 @@ class DRBD8Status(object): """ UNCONF_RE = re.compile(r"\s*[0-9]+:\s*cs:Unconfigured$") - LINE_RE = re.compile(r"\s*[0-9]+:\s*cs:(\S+)\s+st:([^/]+)/(\S+)" + LINE_RE = re.compile(r"\s*[0-9]+:\s*cs:(\S+)\s+(?:st|ro):([^/]+)/(\S+)" "\s+ds:([^/]+)/(\S+)\s+.*$") SYNC_RE = re.compile(r"^.*\ssync'ed:\s*([0-9.]+)%.*" "\sfinish: ([0-9]+):([0-9]+):([0-9]+)\s.*$") + CS_UNCONFIGURED = "Unconfigured" + CS_STANDALONE = "StandAlone" + CS_WFCONNECTION = "WFConnection" + CS_WFREPORTPARAMS = "WFReportParams" + CS_CONNECTED = "Connected" + CS_STARTINGSYNCS = "StartingSyncS" + CS_STARTINGSYNCT = "StartingSyncT" + CS_WFBITMAPS = "WFBitMapS" + CS_WFBITMAPT = "WFBitMapT" + CS_WFSYNCUUID = "WFSyncUUID" + CS_SYNCSOURCE = "SyncSource" + CS_SYNCTARGET = "SyncTarget" + CS_PAUSEDSYNCS = "PausedSyncS" + CS_PAUSEDSYNCT = "PausedSyncT" + CSET_SYNC = frozenset([ + CS_WFREPORTPARAMS, + CS_STARTINGSYNCS, + CS_STARTINGSYNCT, + CS_WFBITMAPS, + CS_WFBITMAPT, + CS_WFSYNCUUID, + CS_SYNCSOURCE, + CS_SYNCTARGET, + CS_PAUSEDSYNCS, + CS_PAUSEDSYNCT, + ]) + + DS_DISKLESS = "Diskless" + DS_ATTACHING = "Attaching" # transient state + DS_FAILED = "Failed" # transient state, next: diskless + DS_NEGOTIATING = "Negotiating" # transient state + DS_INCONSISTENT = "Inconsistent" # while syncing or after creation + DS_OUTDATED = "Outdated" + DS_DUNKNOWN = "DUnknown" # shown for peer disk when not connected + DS_CONSISTENT = "Consistent" + DS_UPTODATE = "UpToDate" # normal state + + RO_PRIMARY = "Primary" + RO_SECONDARY = "Secondary" + RO_UNKNOWN = "Unknown" + def __init__(self, procline): u = self.UNCONF_RE.match(procline) if u: - self.cstatus = "Unconfigured" + self.cstatus = self.CS_UNCONFIGURED self.lrole = self.rrole = self.ldisk = self.rdisk = None else: m = self.LINE_RE.match(procline) @@ -585,21 +722,21 @@ class DRBD8Status(object): # end reading of data from the LINE_RE or UNCONF_RE - self.is_standalone = self.cstatus == "StandAlone" - self.is_wfconn = self.cstatus == "WFConnection" - self.is_connected = self.cstatus == "Connected" - self.is_primary = self.lrole == "Primary" - self.is_secondary = self.lrole == "Secondary" - self.peer_primary = self.rrole == "Primary" - self.peer_secondary = self.rrole == "Secondary" + self.is_standalone = self.cstatus == self.CS_STANDALONE + self.is_wfconn = self.cstatus == self.CS_WFCONNECTION + self.is_connected = self.cstatus == self.CS_CONNECTED + self.is_primary = self.lrole == self.RO_PRIMARY + self.is_secondary = self.lrole == self.RO_SECONDARY + self.peer_primary = self.rrole == self.RO_PRIMARY + self.peer_secondary = self.rrole == self.RO_SECONDARY self.both_primary = self.is_primary and self.peer_primary self.both_secondary = self.is_secondary and self.peer_secondary - self.is_diskless = self.ldisk == "Diskless" - self.is_disk_uptodate = self.ldisk == "UpToDate" + self.is_diskless = self.ldisk == self.DS_DISKLESS + self.is_disk_uptodate = self.ldisk == self.DS_UPTODATE - self.is_in_resync = self.cstatus in ("SyncSource", "SyncTarget") - self.is_in_use = self.cstatus != "Unconfigured" + self.is_in_resync = self.cstatus in self.CSET_SYNC + self.is_in_use = self.cstatus != self.CS_UNCONFIGURED m = self.SYNC_RE.match(procline) if m: @@ -609,13 +746,16 @@ class DRBD8Status(object): seconds = int(m.group(4)) self.est_time = hours * 3600 + minutes * 60 + seconds else: - self.sync_percent = None + # we have (in this if branch) no percent information, but if + # we're resyncing we need to 'fake' a sync percent information, + # as this is how cmdlib determines if it makes sense to wait for + # resyncing or not + if self.is_in_resync: + self.sync_percent = 0 + else: + self.sync_percent = None self.est_time = None - self.is_sync_target = self.peer_sync_source = self.cstatus == "SyncTarget" - self.peer_sync_target = self.is_sync_source = self.cstatus == "SyncSource" - self.is_resync = self.is_sync_target or self.is_sync_source - class BaseDRBD(BlockDev): """Base DRBD class. @@ -639,11 +779,14 @@ class BaseDRBD(BlockDev): """Return data from /proc/drbd. """ - stat = open(filename, "r") try: - data = stat.read().splitlines() - finally: - stat.close() + data = utils.ReadFile(filename).splitlines() + except EnvironmentError, err: + if err.errno == errno.ENOENT: + _ThrowError("The file %s cannot be opened, check if the module" + " is loaded (%s)", filename, str(err)) + else: + _ThrowError("Can't read the DRBD proc file %s: %s", filename, str(err)) if not data: _ThrowError("Can't read any data from %s", filename) return data @@ -767,7 +910,13 @@ class BaseDRBD(BlockDev): bytes = sectors * 512 if bytes < 128 * 1024 * 1024: # less than 128MiB _ThrowError("Meta device too small (%.2fMib)", (bytes / 1024 / 1024)) - if bytes > (128 + 32) * 1024 * 1024: # account for an extra (big) PE on LVM + # the maximum *valid* size of the meta device when living on top + # of LVM is hard to compute: it depends on the number of stripes + # and the PE size; e.g. a 2-stripe, 64MB PE will result in a 128MB + # (normal size), but an eight-stripe 128MB PE will result in a 1GB + # size meta device; as such, we restrict it to 1GB (a little bit + # too generous, but making assumptions about PE size is hard) + if bytes > 1024 * 1024 * 1024: _ThrowError("Meta device too big (%.2fMiB)", (bytes / 1024 / 1024)) def Rename(self, new_id): @@ -798,10 +947,10 @@ class DRBD8(BaseDRBD): # timeout constants _NET_RECONFIG_TIMEOUT = 60 - def __init__(self, unique_id, children): + def __init__(self, unique_id, children, size): if children and children.count(None) > 0: children = [] - super(DRBD8, self).__init__(unique_id, children) + super(DRBD8, self).__init__(unique_id, children, size) self.major = self._DRBD_MAJOR version = self._GetVersion() if version['k_major'] != 8 : @@ -889,15 +1038,20 @@ class DRBD8(BaseDRBD): # value types value = pyp.Word(pyp.alphanums + '_-/.:') quoted = dbl_quote + pyp.CharsNotIn('"') + dbl_quote - addr_port = (pyp.Word(pyp.nums + '.') + pyp.Literal(':').suppress() + - number) + addr_type = (pyp.Optional(pyp.Literal("ipv4")).suppress() + + pyp.Optional(pyp.Literal("ipv6")).suppress()) + addr_port = (addr_type + pyp.Word(pyp.nums + '.') + + pyp.Literal(':').suppress() + number) # meta device, extended syntax meta_value = ((value ^ quoted) + pyp.Literal('[').suppress() + number + pyp.Word(']').suppress()) + # device name, extended syntax + device_value = pyp.Literal("minor").suppress() + number # a statement stmt = (~rbrace + keyword + ~lbrace + - pyp.Optional(addr_port ^ value ^ quoted ^ meta_value) + + pyp.Optional(addr_port ^ value ^ quoted ^ meta_value ^ + device_value) + pyp.Optional(defa) + semi + pyp.Optional(pyp.restOfLine).suppress()) @@ -1019,12 +1173,16 @@ class DRBD8(BaseDRBD): return retval @classmethod - def _AssembleLocal(cls, minor, backend, meta): + def _AssembleLocal(cls, minor, backend, meta, size): """Configure the local part of a DRBD device. """ args = ["drbdsetup", cls._DevPath(minor), "disk", - backend, meta, "0", "-e", "detach", "--create-device"] + backend, meta, "0", + "-e", "detach", + "--create-device"] + if size: + args.extend(["-d", "%sm" % size]) result = utils.RunCmd(args) if result.failed: _ThrowError("drbd%d: can't attach local disk: %s", minor, result.output) @@ -1101,7 +1259,7 @@ class DRBD8(BaseDRBD): self._CheckMetaSize(meta.dev_path) self._InitMeta(self._FindUnusedMinor(), meta.dev_path) - self._AssembleLocal(self.minor, backend.dev_path, meta.dev_path) + self._AssembleLocal(self.minor, backend.dev_path, meta.dev_path, self.size) self._children = devices def RemoveChildren(self, devices): @@ -1183,26 +1341,39 @@ class DRBD8(BaseDRBD): If sync_percent is None, it means all is ok - If estimated_time is None, it means we can't esimate + If estimated_time is None, it means we can't estimate the time needed, otherwise it's the time left in seconds. We set the is_degraded parameter to True on two conditions: network not connected or local disk missing. - We compute the ldisk parameter based on wheter we have a local + We compute the ldisk parameter based on whether we have a local disk or not. - @rtype: tuple - @return: (sync_percent, estimated_time, is_degraded, ldisk) + @rtype: objects.BlockDevStatus """ if self.minor is None and not self.Attach(): _ThrowError("drbd%d: can't Attach() in GetSyncStatus", self._aminor) + stats = self.GetProcStatus() - ldisk = not stats.is_disk_uptodate - is_degraded = not stats.is_connected - return stats.sync_percent, stats.est_time, is_degraded or ldisk, ldisk + is_degraded = not stats.is_connected or not stats.is_disk_uptodate + + if stats.is_disk_uptodate: + ldisk_status = constants.LDS_OKAY + elif stats.is_diskless: + ldisk_status = constants.LDS_FAULTY + else: + ldisk_status = constants.LDS_UNKNOWN + + return objects.BlockDevStatus(dev_path=self.dev_path, + major=self.major, + minor=self.minor, + sync_percent=stats.sync_percent, + estimated_time=stats.est_time, + is_degraded=is_degraded, + ldisk_status=ldisk_status) def Open(self, force=False): """Make the local state primary. @@ -1260,14 +1431,14 @@ class DRBD8(BaseDRBD): ever_disconnected = _IgnoreError(self._ShutdownNet, self.minor) timeout_limit = time.time() + self._NET_RECONFIG_TIMEOUT - sleep_time = 0.100 # we start the retry time at 100 miliseconds + sleep_time = 0.100 # we start the retry time at 100 milliseconds while time.time() < timeout_limit: status = self.GetProcStatus() if status.is_standalone: break # retry the disconnect, it seems possible that due to a # well-time disconnect on the peer, my disconnect command might - # be ingored and forgotten + # be ignored and forgotten ever_disconnected = _IgnoreError(self._ShutdownNet, self.minor) or \ ever_disconnected time.sleep(sleep_time) @@ -1384,7 +1555,7 @@ class DRBD8(BaseDRBD): if match_r and "local_dev" not in info: # no local disk, but network attached and it matches self._AssembleLocal(minor, self._children[0].dev_path, - self._children[1].dev_path) + self._children[1].dev_path, self.size) if self._MatchesNet(self._GetDevInfo(self._GetShowData(minor))): break else: @@ -1404,9 +1575,9 @@ class DRBD8(BaseDRBD): try: self._ShutdownNet(minor) except errors.BlockDeviceError, err: - _ThrowError("Device has correct local storage, wrong remote peer" - " and is unable to disconnect in order to attach to" - " the correct peer: %s", str(err)) + _ThrowError("drbd%d: device has correct local storage, wrong" + " remote peer and is unable to disconnect in order" + " to attach to the correct peer: %s", minor, str(err)) # note: _AssembleNet also handles the case when we don't want # local storage (i.e. one or more of the _[lr](host|port) is # None) @@ -1435,7 +1606,7 @@ class DRBD8(BaseDRBD): minor = self._aminor if self._children and self._children[0] and self._children[1]: self._AssembleLocal(minor, self._children[0].dev_path, - self._children[1].dev_path) + self._children[1].dev_path, self.size) if self._lhost and self._lport and self._rhost and self._rport: self._AssembleNet(minor, (self._lhost, self._lport, self._rhost, self._rport), @@ -1475,7 +1646,8 @@ class DRBD8(BaseDRBD): """ result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "down"]) if result.failed: - _ThrowError("Can't shutdown drbd device: %s", result.output) + _ThrowError("drbd%d: can't shutdown drbd device: %s", + minor, result.output) def Shutdown(self): """Shutdown the DRBD device. @@ -1514,14 +1686,15 @@ class DRBD8(BaseDRBD): else: in_use = False if in_use: - _ThrowError("DRBD minor %d already in use at Create() time", aminor) + _ThrowError("drbd%d: minor is already in use at Create() time", aminor) meta = children[1] meta.Assemble() if not meta.Attach(): - raise errors.BlockDeviceError("Can't attach to meta device") + _ThrowError("drbd%d: can't attach to meta device '%s'", + aminor, meta) cls._CheckMetaSize(meta.dev_path) cls._InitMeta(aminor, meta.dev_path) - return cls(unique_id, children) + return cls(unique_id, children, size) def Grow(self, amount): """Resize the DRBD device and its backing storage. @@ -1532,7 +1705,8 @@ class DRBD8(BaseDRBD): if len(self._children) != 2 or None in self._children: _ThrowError("drbd%d: cannot grow diskless device", self.minor) self._children[0].Grow(amount) - result = utils.RunCmd(["drbdsetup", self.dev_path, "resize"]) + result = utils.RunCmd(["drbdsetup", self.dev_path, "resize", "-s", + "%dm" % (self.size + amount)]) if result.failed: _ThrowError("drbd%d: resize failed: %s", self.minor, result.output) @@ -1545,13 +1719,13 @@ class FileStorage(BlockDev): The unique_id for the file device is a (file_driver, file_path) tuple. """ - def __init__(self, unique_id, children): + def __init__(self, unique_id, children, size): """Initalizes a file device backend. """ if children: raise errors.BlockDeviceError("Invalid setup for file device") - super(FileStorage, self).__init__(unique_id, children) + super(FileStorage, self).__init__(unique_id, children, size) if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 2: raise ValueError("Invalid configuration data %s" % str(unique_id)) self.driver = unique_id[0] @@ -1570,7 +1744,7 @@ class FileStorage(BlockDev): def Shutdown(self): """Shutdown the device. - This is a no-op for the file type, as we don't deacivate + This is a no-op for the file type, as we don't deactivate the file on shutdown. """ @@ -1617,6 +1791,19 @@ class FileStorage(BlockDev): self.attached = os.path.exists(self.dev_path) return self.attached + def GetActualSize(self): + """Return the actual disk size. + + @note: the device needs to be active when this is called + + """ + assert self.attached, "BlockDevice not attached in GetActualSize()" + try: + st = os.stat(self.dev_path) + return st.st_size + except OSError, err: + _ThrowError("Can't stat %s: %s", self.dev_path, err) + @classmethod def Create(cls, unique_id, children, size): """Create a new file. @@ -1627,11 +1814,11 @@ class FileStorage(BlockDev): @return: an instance of FileStorage """ - # TODO: decide whether we should check for existing files and - # abort or not if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 2: raise ValueError("Invalid configuration data %s" % str(unique_id)) dev_path = unique_id[1] + if os.path.exists(dev_path): + _ThrowError("File already existing: %s", dev_path) try: f = open(dev_path, 'w') f.truncate(size * 1024 * 1024) @@ -1639,7 +1826,7 @@ class FileStorage(BlockDev): except IOError, err: _ThrowError("Error in file creation: %", str(err)) - return FileStorage(unique_id, children) + return FileStorage(unique_id, children, size) DEV_MAP = { @@ -1649,7 +1836,7 @@ DEV_MAP = { } -def FindDevice(dev_type, unique_id, children): +def FindDevice(dev_type, unique_id, children, size): """Search for an existing, assembled device. This will succeed only if the device exists and is assembled, but it @@ -1658,13 +1845,13 @@ def FindDevice(dev_type, unique_id, children): """ if dev_type not in DEV_MAP: raise errors.ProgrammerError("Invalid block device type '%s'" % dev_type) - device = DEV_MAP[dev_type](unique_id, children) + device = DEV_MAP[dev_type](unique_id, children, size) if not device.attached: return None return device -def Assemble(dev_type, unique_id, children): +def Assemble(dev_type, unique_id, children, size): """Try to attach or assemble an existing device. This will attach to assemble the device, as needed, to bring it @@ -1673,7 +1860,7 @@ def Assemble(dev_type, unique_id, children): """ if dev_type not in DEV_MAP: raise errors.ProgrammerError("Invalid block device type '%s'" % dev_type) - device = DEV_MAP[dev_type](unique_id, children) + device = DEV_MAP[dev_type](unique_id, children, size) device.Assemble() return device