X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/691744c43f814ac6318fdfd5c1b156831b293a3f..e725bee0f4d27fa362d56e4b35f9596a59a67bf9:/lib/bdev.py diff --git a/lib/bdev.py b/lib/bdev.py index cd2250c..1378a2f 100644 --- a/lib/bdev.py +++ b/lib/bdev.py @@ -1,7 +1,7 @@ # # -# Copyright (C) 2006, 2007 Google Inc. +# Copyright (C) 2006, 2007, 2010 Google Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,6 +31,13 @@ import logging from ganeti import utils from ganeti import errors from ganeti import constants +from ganeti import objects +from ganeti import compat +from ganeti import netutils + + +# Size of reads in _CanReadDevice +_DEVICE_READ_SIZE = 128 * 1024 def _IgnoreError(fn, *args, **kwargs): @@ -47,7 +54,7 @@ def _IgnoreError(fn, *args, **kwargs): fn(*args, **kwargs) return True except errors.BlockDeviceError, err: - logging.warning("Caught BlockDeviceError but ignoring: %s" % str(err)) + logging.warning("Caught BlockDeviceError but ignoring: %s", str(err)) return False @@ -65,6 +72,20 @@ def _ThrowError(msg, *args): raise errors.BlockDeviceError(msg) +def _CanReadDevice(path): + """Check if we can read from the given device. + + This tries to read the first 128k of the device. + + """ + try: + utils.ReadFile(path, size=_DEVICE_READ_SIZE) + return True + except EnvironmentError: + logging.warning("Can't read from device %s", path, exc_info=True) + return False + + class BlockDev(object): """Block device abstract class. @@ -228,12 +249,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. @@ -242,22 +267,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): @@ -304,6 +351,10 @@ class LogicalVolume(BlockDev): """Logical Volume block device. """ + _VALID_NAME_RE = re.compile("^[a-zA-Z0-9+_.-]*$") + _INVALID_NAMES = frozenset([".", "..", "snapshot", "pvmove"]) + _INVALID_SUBSTRINGS = frozenset(["_mlog", "_mimage"]) + def __init__(self, unique_id, children, size): """Attaches to a LV device. @@ -314,7 +365,9 @@ class LogicalVolume(BlockDev): 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._ValidateName(self._vg_name) + self._ValidateName(self._lv_name) + self.dev_path = utils.PathJoin("/dev", self._vg_name, self._lv_name) self._degraded = True self.major = self.minor = self.pe_size = self.stripe_count = None self.Attach() @@ -328,13 +381,19 @@ class LogicalVolume(BlockDev): raise errors.ProgrammerError("Invalid configuration data %s" % str(unique_id)) vg_name, lv_name = unique_id - pvs_info = cls.GetPVInfo(vg_name) + cls._ValidateName(vg_name) + cls._ValidateName(lv_name) + pvs_info = cls.GetPVInfo([vg_name]) if not pvs_info: _ThrowError("Can't compute PV info for vg %s", vg_name) pvs_info.sort() pvs_info.reverse() pvlist = [ pv[1] for pv in pvs_info ] + if compat.any(":" in v for v in pvlist): + _ThrowError("Some of your PVs have the invalid character ':' in their" + " name, this is not supported - please filter them out" + " in lvm.conf using either 'filter' or 'preferred_names'") free_size = sum([ pv[0] for pv in pvs_info ]) current_pvs = len(pvlist) stripes = min(current_pvs, constants.LVM_STRIPECOUNT) @@ -359,36 +418,113 @@ class LogicalVolume(BlockDev): return LogicalVolume(unique_id, children, size) @staticmethod - def GetPVInfo(vg_name): + def _GetVolumeInfo(lvm_cmd, fields): + """Returns LVM Volumen infos using lvm_cmd + + @param lvm_cmd: Should be one of "pvs", "vgs" or "lvs" + @param fields: Fields to return + @return: A list of dicts each with the parsed fields + + """ + if not fields: + raise errors.ProgrammerError("No fields specified") + + sep = "|" + cmd = [lvm_cmd, "--noheadings", "--nosuffix", "--units=m", "--unbuffered", + "--separator=%s" % sep, "-o%s" % ",".join(fields)] + + result = utils.RunCmd(cmd) + if result.failed: + raise errors.CommandError("Can't get the volume information: %s - %s" % + (result.fail_reason, result.output)) + + data = [] + for line in result.stdout.splitlines(): + splitted_fields = line.strip().split(sep) + + if len(fields) != len(splitted_fields): + raise errors.CommandError("Can't parse %s output: line '%s'" % + (lvm_cmd, line)) + + data.append(splitted_fields) + + return data + + @classmethod + def GetPVInfo(cls, vg_names, filter_allocatable=True): """Get the free space info for PVs in a volume group. - @param vg_name: the volume group name + @param vg_names: list of volume group names, if empty all will be returned + @param filter_allocatable: whether to skip over unallocatable PVs @rtype: list @return: list of tuples (free_space, name) with free_space in mebibytes """ - command = ["pvs", "--noheadings", "--nosuffix", "--units=m", - "-opv_name,vg_name,pv_free,pv_attr", "--unbuffered", - "--separator=:"] - result = utils.RunCmd(command) - if result.failed: - logging.error("Can't get the PV information: %s - %s", - result.fail_reason, result.output) + try: + info = cls._GetVolumeInfo("pvs", ["pv_name", "vg_name", "pv_free", + "pv_attr"]) + except errors.GenericError, err: + logging.error("Can't get PV information: %s", err) return None + data = [] - for line in result.stdout.splitlines(): - fields = line.strip().split(':') - if len(fields) != 4: - logging.error("Can't parse pvs output: line '%s'", line) - return None - # skip over pvs from another vg or ones which are not allocatable - if fields[1] != vg_name or fields[3][0] != 'a': + for pv_name, vg_name, pv_free, pv_attr in info: + # (possibly) skip over pvs which are not allocatable + if filter_allocatable and pv_attr[0] != "a": + continue + # (possibly) skip over pvs which are not in the right volume group(s) + if vg_names and vg_name not in vg_names: continue - data.append((float(fields[2]), fields[0])) + data.append((float(pv_free), pv_name, vg_name)) return data + @classmethod + def GetVGInfo(cls, vg_names, filter_readonly=True): + """Get the free space info for specific VGs. + + @param vg_names: list of volume group names, if empty all will be returned + @param filter_readonly: whether to skip over readonly VGs + + @rtype: list + @return: list of tuples (free_space, total_size, name) with free_space in + MiB + + """ + try: + info = cls._GetVolumeInfo("vgs", ["vg_name", "vg_free", "vg_attr", + "vg_size"]) + except errors.GenericError, err: + logging.error("Can't get VG information: %s", err) + return None + + data = [] + for vg_name, vg_free, vg_attr, vg_size in info: + # (possibly) skip over vgs which are not writable + if filter_readonly and vg_attr[0] == "r": + continue + # (possibly) skip over vgs which are not in the right volume group(s) + if vg_names and vg_name not in vg_names: + continue + data.append((float(vg_free), float(vg_size), vg_name)) + + return data + + @classmethod + def _ValidateName(cls, name): + """Validates that a given name is valid as VG or LV name. + + The list of valid characters and restricted names is taken out of + the lvm(8) manpage, with the simplification that we enforce both + VG and LV restrictions on the names. + + """ + if (not cls._VALID_NAME_RE.match(name) or + name in cls._INVALID_NAMES or + compat.any(substring in name for substring in cls._INVALID_SUBSTRINGS)): + _ThrowError("Invalid LVM name '%s'", name) + def Remove(self): """Remove this logical volume. @@ -416,7 +552,7 @@ class LogicalVolume(BlockDev): if result.failed: _ThrowError("Failed to rename the logical volume: %s", result.output) self._lv_name = new_name - self.dev_path = "/dev/%s/%s" % (self._vg_name, self._lv_name) + self.dev_path = utils.PathJoin("/dev", self._vg_name, self._lv_name) def Attach(self): """Attach to an existing LV. @@ -523,11 +659,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. @@ -555,12 +701,10 @@ class LogicalVolume(BlockDev): snap = LogicalVolume((self._vg_name, snap_name), None, size) _IgnoreError(snap.Remove) - pvs_info = self.GetPVInfo(self._vg_name) - if not pvs_info: - _ThrowError("Can't compute PV info for vg %s", self._vg_name) - pvs_info.sort() - pvs_info.reverse() - free_size, pv_name = pvs_info[0] + vg_info = self.GetVGInfo([self._vg_name]) + if not vg_info: + _ThrowError("Can't compute VG info for vg %s", self._vg_name) + free_size, _, _ = vg_info[0] if free_size < size: _ThrowError("Not enough free space: required %s," " available %s", size, free_size) @@ -727,8 +871,10 @@ class BaseDRBD(BlockDev): # pylint: disable-msg=W0223 0.7 and 8.x versions of DRBD. """ - _VERSION_RE = re.compile(r"^version: (\d+)\.(\d+)\.(\d+)" + _VERSION_RE = re.compile(r"^version: (\d+)\.(\d+)\.(\d+)(?:\.\d+)?" r" \(api:(\d+)/proto:(\d+)(?:-(\d+))?\)") + _VALID_LINE_RE = re.compile("^ *([0-9]+): cs:([^ ]+).*$") + _UNUSED_LINE_RE = re.compile("^ *([0-9]+): cs:Unconfigured$") _DRBD_MAJOR = 147 _ST_UNCONFIGURED = "Unconfigured" @@ -736,6 +882,7 @@ class BaseDRBD(BlockDev): # pylint: disable-msg=W0223 _ST_CONNECTED = "Connected" _STATUS_FILE = "/proc/drbd" + _USERMODE_HELPER_FILE = "/sys/module/drbd/parameters/usermode_helper" @staticmethod def _GetProcData(filename=_STATUS_FILE): @@ -743,11 +890,7 @@ class BaseDRBD(BlockDev): # pylint: disable-msg=W0223 """ try: - 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" @@ -758,21 +901,20 @@ class BaseDRBD(BlockDev): # pylint: disable-msg=W0223 _ThrowError("Can't read any data from %s", filename) return data - @staticmethod - def _MassageProcData(data): + @classmethod + def _MassageProcData(cls, data): """Transform the output of _GetProdData into a nicer form. @return: a dictionary of minor: joined lines from /proc/drbd for that minor """ - lmatch = re.compile("^ *([0-9]+):.*$") results = {} old_minor = old_line = None for line in data: if not line: # completely empty lines, as can be returned by drbd8.0+ continue - lresult = lmatch.match(line) + lresult = cls._VALID_LINE_RE.match(line) if lresult is not None: if old_minor is not None: results[old_minor] = old_line @@ -787,7 +929,7 @@ class BaseDRBD(BlockDev): # pylint: disable-msg=W0223 return results @classmethod - def _GetVersion(cls): + def _GetVersion(cls, proc_data): """Return the DRBD version. This will return a dict with keys: @@ -799,7 +941,6 @@ class BaseDRBD(BlockDev): # pylint: disable-msg=W0223 - proto2 (only on drbd > 8.2.X) """ - proc_data = cls._GetProcData() first_line = proc_data[0].strip() version = cls._VERSION_RE.match(first_line) if not version: @@ -819,6 +960,23 @@ class BaseDRBD(BlockDev): # pylint: disable-msg=W0223 return retval @staticmethod + def GetUsermodeHelper(filename=_USERMODE_HELPER_FILE): + """Returns DRBD usermode_helper currently set. + + """ + try: + helper = utils.ReadFile(filename).splitlines()[0] + 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 DRBD helper file %s: %s", filename, str(err)) + if not helper: + _ThrowError("Can't read any data from %s", filename) + return helper + + @staticmethod def _DevPath(minor): """Return the path to a drbd device for a given minor. @@ -833,9 +991,8 @@ class BaseDRBD(BlockDev): # pylint: disable-msg=W0223 data = cls._GetProcData() used_devs = {} - valid_line = re.compile("^ *([0-9]+): cs:([^ ]+).*$") for line in data: - match = valid_line.match(line) + match = cls._VALID_LINE_RE.match(line) if not match: continue minor = int(match.group(1)) @@ -876,17 +1033,17 @@ class BaseDRBD(BlockDev): # pylint: disable-msg=W0223 sectors = int(result.stdout) except (TypeError, ValueError): _ThrowError("Invalid output from blockdev: '%s'", result.stdout) - bytes = sectors * 512 - if bytes < 128 * 1024 * 1024: # less than 128MiB - _ThrowError("Meta device too small (%.2fMib)", (bytes / 1024 / 1024)) + num_bytes = sectors * 512 + if num_bytes < 128 * 1024 * 1024: # less than 128MiB + _ThrowError("Meta device too small (%.2fMib)", (num_bytes / 1024 / 1024)) # 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)) + if num_bytes > 1024 * 1024 * 1024: + _ThrowError("Meta device too big (%.2fMiB)", (num_bytes / 1024 / 1024)) def Rename(self, new_id): """Rename a device. @@ -919,14 +1076,6 @@ class DRBD8(BaseDRBD): def __init__(self, unique_id, children, size): if children and children.count(None) > 0: children = [] - super(DRBD8, self).__init__(unique_id, children, size) - self.major = self._DRBD_MAJOR - version = self._GetVersion() - if version['k_major'] != 8 : - _ThrowError("Mismatch in DRBD kernel version and requested ganeti" - " usage: kernel is %s.%s, ganeti wants 8.x", - version['k_major'], version['k_minor']) - if len(children) not in (0, 2): raise ValueError("Invalid configuration data %s" % str(children)) if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 6: @@ -934,6 +1083,18 @@ class DRBD8(BaseDRBD): (self._lhost, self._lport, self._rhost, self._rport, self._aminor, self._secret) = unique_id + if children: + if not _CanReadDevice(children[1].dev_path): + logging.info("drbd%s: Ignoring unreadable meta device", self._aminor) + children = [] + super(DRBD8, self).__init__(unique_id, children, size) + self.major = self._DRBD_MAJOR + version = self._GetVersion(self._GetProcData()) + if version['k_major'] != 8 : + _ThrowError("Mismatch in DRBD kernel version and requested ganeti" + " usage: kernel is %s.%s, ganeti wants 8.x", + version['k_major'], version['k_minor']) + if (self._lhost is not None and self._lhost == self._rhost and self._lport == self._rport): raise ValueError("Invalid configuration data, same local/remote %s" % @@ -962,14 +1123,12 @@ class DRBD8(BaseDRBD): """ data = cls._GetProcData() - unused_line = re.compile("^ *([0-9]+): cs:Unconfigured$") - used_line = re.compile("^ *([0-9]+): cs:") highest = None for line in data: - match = unused_line.match(line) + match = cls._UNUSED_LINE_RE.match(line) if match: return int(match.group(1)) - match = used_line.match(line) + match = cls._VALID_LINE_RE.match(line) if match: minor = int(match.group(1)) highest = max(highest, minor) @@ -994,7 +1153,10 @@ class DRBD8(BaseDRBD): # pyparsing setup lbrace = pyp.Literal("{").suppress() rbrace = pyp.Literal("}").suppress() + lbracket = pyp.Literal("[").suppress() + rbracket = pyp.Literal("]").suppress() semi = pyp.Literal(";").suppress() + colon = pyp.Literal(":").suppress() # this also converts the value to an int number = pyp.Word(pyp.nums).setParseAction(lambda s, l, t: int(t[0])) @@ -1007,19 +1169,19 @@ class DRBD8(BaseDRBD): # value types value = pyp.Word(pyp.alphanums + '_-/.:') quoted = dbl_quote + pyp.CharsNotIn('"') + dbl_quote - 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) + ipv4_addr = (pyp.Optional(pyp.Literal("ipv4")).suppress() + + pyp.Word(pyp.nums + ".") + colon + number) + ipv6_addr = (pyp.Optional(pyp.Literal("ipv6")).suppress() + + pyp.Optional(lbracket) + pyp.Word(pyp.hexnums + ":") + + pyp.Optional(rbracket) + colon + number) # meta device, extended syntax - meta_value = ((value ^ quoted) + pyp.Literal('[').suppress() + - number + pyp.Word(']').suppress()) + meta_value = ((value ^ quoted) + lbracket + number + rbracket) # 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(ipv4_addr ^ ipv6_addr ^ value ^ quoted ^ meta_value ^ device_value) + pyp.Optional(defa) + semi + pyp.Optional(pyp.restOfLine).suppress()) @@ -1152,6 +1314,24 @@ class DRBD8(BaseDRBD): "--create-device"] if size: args.extend(["-d", "%sm" % size]) + if not constants.DRBD_BARRIERS: # disable barriers, if configured so + version = cls._GetVersion(cls._GetProcData()) + # various DRBD versions support different disk barrier options; + # what we aim here is to revert back to the 'drain' method of + # disk flushes and to disable metadata barriers, in effect going + # back to pre-8.0.7 behaviour + vmaj = version['k_major'] + vmin = version['k_minor'] + vrel = version['k_point'] + assert vmaj == 8 + if vmin == 0: # 8.0.x + if vrel >= 12: + args.extend(['-i', '-m']) + elif vmin == 2: # 8.2.x + if vrel >= 7: + args.extend(['-i', '-m']) + elif vmaj >= 3: # 8.3.x or newer + args.extend(['-i', '-a', 'm']) result = utils.RunCmd(args) if result.failed: _ThrowError("drbd%d: can't attach local disk: %s", minor, result.output) @@ -1177,8 +1357,22 @@ class DRBD8(BaseDRBD): # about its peer. cls._SetMinorSyncSpeed(minor, constants.SYNC_SPEED) + if netutils.IP6Address.IsValid(lhost): + if not netutils.IP6Address.IsValid(rhost): + _ThrowError("drbd%d: can't connect ip %s to ip %s" % + (minor, lhost, rhost)) + family = "ipv6" + elif netutils.IP4Address.IsValid(lhost): + if not netutils.IP4Address.IsValid(rhost): + _ThrowError("drbd%d: can't connect ip %s to ip %s" % + (minor, lhost, rhost)) + family = "ipv4" + else: + _ThrowError("drbd%d: Invalid ip %s" % (minor, lhost)) + args = ["drbdsetup", cls._DevPath(minor), "net", - "%s:%s" % (lhost, lport), "%s:%s" % (rhost, rport), protocol, + "%s:%s:%s" % (family, lhost, lport), + "%s:%s:%s" % (family, rhost, rport), protocol, "-A", "discard-zero-changes", "-B", "consensus", "--create-device", @@ -1192,20 +1386,18 @@ class DRBD8(BaseDRBD): _ThrowError("drbd%d: can't setup network: %s - %s", minor, result.fail_reason, result.output) - timeout = time.time() + 10 - ok = False - while time.time() < timeout: + def _CheckNetworkConfig(): info = cls._GetDevInfo(cls._GetShowData(minor)) if not "local_addr" in info or not "remote_addr" in info: - time.sleep(1) - continue + raise utils.RetryAgain() + if (info["local_addr"] != (lhost, lport) or info["remote_addr"] != (rhost, rport)): - time.sleep(1) - continue - ok = True - break - if not ok: + raise utils.RetryAgain() + + try: + utils.Retry(_CheckNetworkConfig, 1.0, 10.0) + except utils.RetryTimeout: _ThrowError("drbd%d: timeout while configuring network", minor) def AddChildren(self, devices): @@ -1320,16 +1512,29 @@ class DRBD8(BaseDRBD): 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. @@ -1385,31 +1590,42 @@ class DRBD8(BaseDRBD): _ThrowError("drbd%d: DRBD disk missing network info in" " DisconnectNet()", self.minor) - 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 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 ignored and forgotten - ever_disconnected = _IgnoreError(self._ShutdownNet, self.minor) or \ - ever_disconnected - time.sleep(sleep_time) - sleep_time = min(2, sleep_time * 1.5) + class _DisconnectStatus: + def __init__(self, ever_disconnected): + self.ever_disconnected = ever_disconnected - if not status.is_standalone: - if ever_disconnected: + dstatus = _DisconnectStatus(_IgnoreError(self._ShutdownNet, self.minor)) + + def _WaitForDisconnect(): + if self.GetProcStatus().is_standalone: + return + + # retry the disconnect, it seems possible that due to a well-time + # disconnect on the peer, my disconnect command might be ignored and + # forgotten + dstatus.ever_disconnected = \ + _IgnoreError(self._ShutdownNet, self.minor) or dstatus.ever_disconnected + + raise utils.RetryAgain() + + # Keep start time + start_time = time.time() + + try: + # Start delay at 100 milliseconds and grow up to 2 seconds + utils.Retry(_WaitForDisconnect, (0.1, 1.5, 2.0), + self._NET_RECONFIG_TIMEOUT) + except utils.RetryTimeout: + if dstatus.ever_disconnected: msg = ("drbd%d: device did not react to the" " 'disconnect' command in a timely manner") else: msg = "drbd%d: can't shutdown network, even after multiple retries" + _ThrowError(msg, self.minor) - reconfig_time = time.time() - timeout_limit + self._NET_RECONFIG_TIMEOUT - if reconfig_time > 15: # hardcoded alert limit + reconfig_time = time.time() - start_time + if reconfig_time > (self._NET_RECONFIG_TIMEOUT * 0.25): logging.info("drbd%d: DisconnectNet: detach took %.3f seconds", self.minor, reconfig_time) @@ -1488,6 +1704,8 @@ class DRBD8(BaseDRBD): the attach if can return success. """ + # TODO: Rewrite to not use a for loop just because there is 'break' + # pylint: disable-msg=W0631 net_data = (self._lhost, self._lport, self._rhost, self._rport) for minor in (self._aminor,): info = self._GetDevInfo(self._GetShowData(minor)) @@ -1735,6 +1953,31 @@ class FileStorage(BlockDev): if err.errno != errno.ENOENT: _ThrowError("Can't remove file '%s': %s", self.dev_path, err) + def Rename(self, new_id): + """Renames the file. + + """ + # TODO: implement rename for file-based storage + _ThrowError("Rename is not supported for file-based storage") + + def Grow(self, amount): + """Grow the file + + @param amount: the amount (in mebibytes) to grow with + + """ + # Check that the file exists + self.Assemble() + current_size = self.GetActualSize() + new_size = current_size + amount * 1024 * 1024 + assert new_size > current_size, "Cannot Grow with a negative amount" + try: + f = open(self.dev_path, "a+") + f.truncate(new_size) + f.close() + except EnvironmentError, err: + _ThrowError("Error in file growth: %", str(err)) + def Attach(self): """Attach to an existing file. @@ -1773,13 +2016,14 @@ class FileStorage(BlockDev): 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') + fd = os.open(dev_path, os.O_RDWR | os.O_CREAT | os.O_EXCL) + f = os.fdopen(fd, "w") f.truncate(size * 1024 * 1024) f.close() - except IOError, err: + except EnvironmentError, err: + if err.errno == errno.EEXIST: + _ThrowError("File already existing: %s", dev_path) _ThrowError("Error in file creation: %", str(err)) return FileStorage(unique_id, children, size) @@ -1788,9 +2032,11 @@ class FileStorage(BlockDev): DEV_MAP = { constants.LD_LV: LogicalVolume, constants.LD_DRBD8: DRBD8, - constants.LD_FILE: FileStorage, } +if constants.ENABLE_FILE_STORAGE: + DEV_MAP[constants.LD_FILE] = FileStorage + def FindDevice(dev_type, unique_id, children, size): """Search for an existing, assembled device.