X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/7fe23d47db46f5eb76591772fcf06ccdffeb2c3d..3201717461bc6e55f2deab7ad426ebfbb7b1e943:/lib/bdev.py diff --git a/lib/bdev.py b/lib/bdev.py index 10dba32..3f9441d 100644 --- a/lib/bdev.py +++ b/lib/bdev.py @@ -24,6 +24,7 @@ import re import time import errno +import shlex import stat import pyparsing as pyp import os @@ -130,7 +131,7 @@ class BlockDev(object): after assembly we'll have our correct major/minor. """ - def __init__(self, unique_id, children, size): + def __init__(self, unique_id, children, size, params): self._children = children self.dev_path = None self.unique_id = unique_id @@ -138,6 +139,7 @@ class BlockDev(object): self.minor = None self.attached = False self.size = size + self.params = params def Assemble(self): """Assemble the device from its components. @@ -166,7 +168,7 @@ class BlockDev(object): raise NotImplementedError @classmethod - def Create(cls, unique_id, children, size): + def Create(cls, unique_id, children, size, params): """Create the device. If the device cannot be created, it will return None @@ -321,7 +323,6 @@ class BlockDev(object): is_degraded=is_degraded, ldisk_status=ldisk_status) - def SetInfo(self, text): """Update metadata with info text. @@ -374,13 +375,13 @@ class LogicalVolume(BlockDev): _INVALID_NAMES = frozenset([".", "..", "snapshot", "pvmove"]) _INVALID_SUBSTRINGS = frozenset(["_mlog", "_mimage"]) - def __init__(self, unique_id, children, size): + def __init__(self, unique_id, children, size, params): """Attaches to a LV device. The unique_id is a tuple (vg_name, lv_name) """ - super(LogicalVolume, self).__init__(unique_id, children, size) + super(LogicalVolume, self).__init__(unique_id, children, size, params) 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 @@ -392,7 +393,7 @@ class LogicalVolume(BlockDev): self.Attach() @classmethod - def Create(cls, unique_id, children, size): + def Create(cls, unique_id, children, size, params): """Create a new logical volume. """ @@ -408,14 +409,18 @@ class LogicalVolume(BlockDev): pvs_info.sort() pvs_info.reverse() - pvlist = [ pv[1] for pv in pvs_info ] + 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 ]) + free_size = sum([pv[0] for pv in pvs_info]) current_pvs = len(pvlist) - stripes = min(current_pvs, constants.LVM_STRIPECOUNT) + desired_stripes = params[constants.LDP_STRIPES] + stripes = min(current_pvs, desired_stripes) + if stripes < desired_stripes: + logging.warning("Could not use %d stripes for VG %s, as only %d PVs are" + " available.", desired_stripes, vg_name, current_pvs) # The size constraint should have been checked from the master before # calling the create function. @@ -434,7 +439,7 @@ class LogicalVolume(BlockDev): if result.failed: _ThrowError("LV create failed (%s): %s", result.fail_reason, result.output) - return LogicalVolume(unique_id, children, size) + return LogicalVolume(unique_id, children, size, params) @staticmethod def _GetVolumeInfo(lvm_cmd, fields): @@ -600,7 +605,7 @@ class LogicalVolume(BlockDev): # 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[-1].strip().rstrip(",") out = out.split(",") if len(out) != 5: logging.error("Can't parse LVS output, len(%s) != 5", str(out)) @@ -633,7 +638,7 @@ class LogicalVolume(BlockDev): self.minor = minor self.pe_size = pe_size self.stripe_count = stripes - self._degraded = status[0] == 'v' # virtual volume, i.e. doesn't backing + self._degraded = status[0] == "v" # virtual volume, i.e. doesn't backing # storage self.attached = True return True @@ -719,7 +724,7 @@ class LogicalVolume(BlockDev): snap_name = self._lv_name + ".snap" # remove existing snapshot if found - snap = LogicalVolume((self._vg_name, snap_name), None, size) + snap = LogicalVolume((self._vg_name, snap_name), None, size, self.params) _IgnoreError(snap.Remove) vg_info = self.GetVGInfo([self._vg_name]) @@ -745,8 +750,8 @@ class LogicalVolume(BlockDev): BlockDev.SetInfo(self, text) # Replace invalid characters - text = re.sub('^[^A-Za-z0-9_+.]', '_', text) - text = re.sub('[^-A-Za-z0-9_+.]', '_', text) + text = re.sub("^[^A-Za-z0-9_+.]", "_", text) + text = re.sub("[^-A-Za-z0-9_+.]", "_", text) # Only up to 128 characters are allowed text = text[:128] @@ -792,7 +797,10 @@ class DRBD8Status(object): 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.*$") + # Due to a bug in drbd in the kernel, introduced in + # commit 4b0715f096 (still unfixed as of 2011-08-22) + "(?:\s|M)" + "finish: ([0-9]+):([0-9]+):([0-9]+)\s.*$") CS_UNCONFIGURED = "Unconfigured" CS_STANDALONE = "StandAlone" @@ -887,7 +895,7 @@ class DRBD8Status(object): self.est_time = None -class BaseDRBD(BlockDev): # pylint: disable-msg=W0223 +class BaseDRBD(BlockDev): # pylint: disable=W0223 """Base DRBD class. This class contains a few bits of common functionality between the @@ -971,14 +979,14 @@ class BaseDRBD(BlockDev): # pylint: disable-msg=W0223 first_line) values = version.groups() - retval = {'k_major': int(values[0]), - 'k_minor': int(values[1]), - 'k_point': int(values[2]), - 'api': int(values[3]), - 'proto': int(values[4]), + retval = {"k_major": int(values[0]), + "k_minor": int(values[1]), + "k_point": int(values[2]), + "api": int(values[3]), + "proto": int(values[4]), } if values[5] is not None: - retval['proto2'] = values[5] + retval["proto2"] = values[5] return retval @@ -1096,7 +1104,13 @@ class DRBD8(BaseDRBD): # timeout constants _NET_RECONFIG_TIMEOUT = 60 - def __init__(self, unique_id, children, size): + # command line options for barriers + _DISABLE_DISK_OPTION = "--no-disk-barrier" # -a + _DISABLE_DRAIN_OPTION = "--no-disk-drain" # -D + _DISABLE_FLUSH_OPTION = "--no-disk-flushes" # -i + _DISABLE_META_FLUSH_OPTION = "--no-md-flushes" # -m + + def __init__(self, unique_id, children, size, params): if children and children.count(None) > 0: children = [] if len(children) not in (0, 2): @@ -1110,13 +1124,13 @@ class DRBD8(BaseDRBD): 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) + super(DRBD8, self).__init__(unique_id, children, size, params) self.major = self._DRBD_MAJOR version = self._GetVersion(self._GetProcData()) - if version['k_major'] != 8 : + 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']) + version["k_major"], version["k_minor"]) if (self._lhost is not None and self._lhost == self._rhost and self._lport == self._rport): @@ -1131,6 +1145,17 @@ class DRBD8(BaseDRBD): This will not work if the given minor is in use. """ + # Zero the metadata first, in order to make sure drbdmeta doesn't + # try to auto-detect existing filesystems or similar (see + # http://code.google.com/p/ganeti/issues/detail?id=182); we only + # care about the first 128MB of data in the device, even though it + # can be bigger + result = utils.RunCmd([constants.DD_CMD, + "if=/dev/zero", "of=%s" % dev_path, + "bs=1048576", "count=128", "oflag=direct"]) + if result.failed: + _ThrowError("Can't wipe the meta device: %s", result.output) + result = utils.RunCmd(["drbdmeta", "--force", cls._DevPath(minor), "v08", dev_path, "0", "create-md"]) if result.failed: @@ -1183,7 +1208,7 @@ class DRBD8(BaseDRBD): # this also converts the value to an int number = pyp.Word(pyp.nums).setParseAction(lambda s, l, t: int(t[0])) - comment = pyp.Literal ("#") + pyp.Optional(pyp.restOfLine) + comment = pyp.Literal("#") + pyp.Optional(pyp.restOfLine) defa = pyp.Literal("_is_default").suppress() dbl_quote = pyp.Literal('"').suppress() @@ -1210,7 +1235,7 @@ class DRBD8(BaseDRBD): pyp.Optional(pyp.restOfLine).suppress()) # an entire section - section_name = pyp.Word(pyp.alphas + '_') + section_name = pyp.Word(pyp.alphas + "_") section = section_name + lbrace + pyp.ZeroOrMore(pyp.Group(stmt)) + rbrace bnf = pyp.ZeroOrMore(pyp.Group(section ^ stmt)) @@ -1326,41 +1351,110 @@ class DRBD8(BaseDRBD): info["remote_addr"] == (self._rhost, self._rport)) return retval - @classmethod - def _AssembleLocal(cls, minor, backend, meta, size): + def _AssembleLocal(self, minor, backend, meta, size): """Configure the local part of a DRBD device. """ - args = ["drbdsetup", cls._DevPath(minor), "disk", + args = ["drbdsetup", self._DevPath(minor), "disk", backend, meta, "0", "-e", "detach", "--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']) + + version = self._GetVersion(self._GetProcData()) + vmaj = version["k_major"] + vmin = version["k_minor"] + vrel = version["k_point"] + + barrier_args = \ + self._ComputeDiskBarrierArgs(vmaj, vmin, vrel, + self.params[constants.LDP_BARRIERS], + self.params[constants.LDP_NO_META_FLUSH]) + args.extend(barrier_args) + + if self.params[constants.LDP_DISK_CUSTOM]: + args.extend(shlex.split(self.params[constants.LDP_DISK_CUSTOM])) + result = utils.RunCmd(args) if result.failed: _ThrowError("drbd%d: can't attach local disk: %s", minor, result.output) @classmethod - def _AssembleNet(cls, minor, net_info, protocol, + def _ComputeDiskBarrierArgs(cls, vmaj, vmin, vrel, disabled_barriers, + disable_meta_flush): + """Compute the DRBD command line parameters for disk barriers + + Returns a list of the disk barrier parameters as requested via the + disabled_barriers and disable_meta_flush arguments, and according to the + supported ones in the DRBD version vmaj.vmin.vrel + + If the desired option is unsupported, raises errors.BlockDeviceError. + + """ + disabled_barriers_set = frozenset(disabled_barriers) + if not disabled_barriers_set in constants.DRBD_VALID_BARRIER_OPT: + raise errors.BlockDeviceError("%s is not a valid option set for DRBD" + " barriers" % disabled_barriers) + + args = [] + + # The following code assumes DRBD 8.x, with x < 4 and x != 1 (DRBD 8.1.x + # does not exist) + if not vmaj == 8 and vmin in (0, 2, 3): + raise errors.BlockDeviceError("Unsupported DRBD version: %d.%d.%d" % + (vmaj, vmin, vrel)) + + def _AppendOrRaise(option, min_version): + """Helper for DRBD options""" + if min_version is not None and vrel >= min_version: + args.append(option) + else: + raise errors.BlockDeviceError("Could not use the option %s as the" + " DRBD version %d.%d.%d does not support" + " it." % (option, vmaj, vmin, vrel)) + + # the minimum version for each feature is encoded via pairs of (minor + # version -> x) where x is version in which support for the option was + # introduced. + meta_flush_supported = disk_flush_supported = { + 0: 12, + 2: 7, + 3: 0, + } + + disk_drain_supported = { + 2: 7, + 3: 0, + } + + disk_barriers_supported = { + 3: 0, + } + + # meta flushes + if disable_meta_flush: + _AppendOrRaise(cls._DISABLE_META_FLUSH_OPTION, + meta_flush_supported.get(vmin, None)) + + # disk flushes + if constants.DRBD_B_DISK_FLUSH in disabled_barriers_set: + _AppendOrRaise(cls._DISABLE_FLUSH_OPTION, + disk_flush_supported.get(vmin, None)) + + # disk drain + if constants.DRBD_B_DISK_DRAIN in disabled_barriers_set: + _AppendOrRaise(cls._DISABLE_DRAIN_OPTION, + disk_drain_supported.get(vmin, None)) + + # disk barriers + if constants.DRBD_B_DISK_BARRIERS in disabled_barriers_set: + _AppendOrRaise(cls._DISABLE_DISK_OPTION, + disk_barriers_supported.get(vmin, None)) + + return args + + def _AssembleNet(self, minor, net_info, protocol, dual_pri=False, hmac=None, secret=None): """Configure the network part of the device. @@ -1369,7 +1463,7 @@ class DRBD8(BaseDRBD): if None in net_info: # we don't want network connection and actually want to make # sure its shutdown - cls._ShutdownNet(minor) + self._ShutdownNet(minor) return # Workaround for a race condition. When DRBD is doing its dance to @@ -1378,7 +1472,8 @@ class DRBD8(BaseDRBD): # sync speed only after setting up both sides can race with DRBD # connecting, hence we set it here before telling DRBD anything # about its peer. - cls._SetMinorSyncSpeed(minor, constants.SYNC_SPEED) + sync_speed = self.params.get(constants.LDP_RESYNC_RATE) + self._SetMinorSyncSpeed(minor, sync_speed) if netutils.IP6Address.IsValid(lhost): if not netutils.IP6Address.IsValid(rhost): @@ -1393,7 +1488,7 @@ class DRBD8(BaseDRBD): else: _ThrowError("drbd%d: Invalid ip %s" % (minor, lhost)) - args = ["drbdsetup", cls._DevPath(minor), "net", + args = ["drbdsetup", self._DevPath(minor), "net", "%s:%s:%s" % (family, lhost, lport), "%s:%s:%s" % (family, rhost, rport), protocol, "-A", "discard-zero-changes", @@ -1404,13 +1499,17 @@ class DRBD8(BaseDRBD): args.append("-m") if hmac and secret: args.extend(["-a", hmac, "-x", secret]) + + if self.params[constants.LDP_NET_CUSTOM]: + args.extend(shlex.split(self.params[constants.LDP_NET_CUSTOM])) + result = utils.RunCmd(args) if result.failed: _ThrowError("drbd%d: can't setup network: %s - %s", minor, result.fail_reason, result.output) def _CheckNetworkConfig(): - info = cls._GetDevInfo(cls._GetShowData(minor)) + info = self._GetDevInfo(self._GetShowData(minor)) if not "local_addr" in info or not "remote_addr" in info: raise utils.RetryAgain() @@ -1730,6 +1829,7 @@ class DRBD8(BaseDRBD): - if we have a configured device, we try to ensure that it matches our config - if not, we create it from zero + - anyway, set the device parameters """ super(DRBD8, self).Assemble() @@ -1743,6 +1843,9 @@ class DRBD8(BaseDRBD): # the device self._SlowAssemble() + sync_speed = self.params.get(constants.LDP_RESYNC_RATE) + self.SetSyncSpeed(sync_speed) + def _SlowAssemble(self): """Assembles the DRBD device from a (partially) configured device. @@ -1752,7 +1855,7 @@ class DRBD8(BaseDRBD): """ # TODO: Rewrite to not use a for loop just because there is 'break' - # pylint: disable-msg=W0631 + # pylint: disable=W0631 net_data = (self._lhost, self._lport, self._rhost, self._rport) for minor in (self._aminor,): info = self._GetDevInfo(self._GetShowData(minor)) @@ -1889,7 +1992,7 @@ class DRBD8(BaseDRBD): self.Shutdown() @classmethod - def Create(cls, unique_id, children, size): + def Create(cls, unique_id, children, size, params): """Create a new DRBD8 device. Since DRBD devices are not created per se, just assembled, this @@ -1915,7 +2018,7 @@ class DRBD8(BaseDRBD): aminor, meta) cls._CheckMetaSize(meta.dev_path) cls._InitMeta(aminor, meta.dev_path) - return cls(unique_id, children, size) + return cls(unique_id, children, size, params) def Grow(self, amount, dryrun): """Resize the DRBD device and its backing storage. @@ -1943,13 +2046,13 @@ class FileStorage(BlockDev): The unique_id for the file device is a (file_driver, file_path) tuple. """ - def __init__(self, unique_id, children, size): + def __init__(self, unique_id, children, size, params): """Initalizes a file device backend. """ if children: raise errors.BlockDeviceError("Invalid setup for file device") - super(FileStorage, self).__init__(unique_id, children, size) + super(FileStorage, self).__init__(unique_id, children, size, params) 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] @@ -2057,7 +2160,7 @@ class FileStorage(BlockDev): _ThrowError("Can't stat %s: %s", self.dev_path, err) @classmethod - def Create(cls, unique_id, children, size): + def Create(cls, unique_id, children, size, params): """Create a new file. @param size: the size of file in MiB @@ -2079,7 +2182,7 @@ class FileStorage(BlockDev): _ThrowError("File already existing: %s", dev_path) _ThrowError("Error in file creation: %", str(err)) - return FileStorage(unique_id, children, size) + return FileStorage(unique_id, children, size, params) class PersistentBlockDevice(BlockDev): @@ -2092,17 +2195,18 @@ class PersistentBlockDevice(BlockDev): For the time being, pathnames are required to lie under /dev. """ - def __init__(self, unique_id, children, size): + def __init__(self, unique_id, children, size, params): """Attaches to a static block device. The unique_id is a path under /dev. """ - super(PersistentBlockDevice, self).__init__(unique_id, children, size) + super(PersistentBlockDevice, self).__init__(unique_id, children, size, + params) if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 2: raise ValueError("Invalid configuration data %s" % str(unique_id)) self.dev_path = unique_id[1] - if not os.path.realpath(self.dev_path).startswith('/dev/'): + if not os.path.realpath(self.dev_path).startswith("/dev/"): raise ValueError("Full path '%s' lies outside /dev" % os.path.realpath(self.dev_path)) # TODO: this is just a safety guard checking that we only deal with devices @@ -2117,13 +2221,13 @@ class PersistentBlockDevice(BlockDev): self.Attach() @classmethod - def Create(cls, unique_id, children, size): + def Create(cls, unique_id, children, size, params): """Create a new device This is a noop, we only return a PersistentBlockDevice instance """ - return PersistentBlockDevice(unique_id, children, 0) + return PersistentBlockDevice(unique_id, children, 0, params) def Remove(self): """Remove a device @@ -2202,40 +2306,69 @@ if constants.ENABLE_FILE_STORAGE or constants.ENABLE_SHARED_FILE_STORAGE: DEV_MAP[constants.LD_FILE] = FileStorage -def FindDevice(dev_type, unique_id, children, size): +def _VerifyDiskType(dev_type): + if dev_type not in DEV_MAP: + raise errors.ProgrammerError("Invalid block device type '%s'" % dev_type) + + +def FindDevice(disk, children): """Search for an existing, assembled device. This will succeed only if the device exists and is assembled, but it does not do any actions in order to activate the device. + @type disk: L{objects.Disk} + @param disk: the disk object to find + @type children: list of L{bdev.BlockDev} + @param children: the list of block devices that are children of the device + represented by the disk parameter + """ - 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, size) + _VerifyDiskType(disk.dev_type) + dev_params = objects.FillDict(constants.DISK_LD_DEFAULTS[disk.dev_type], + disk.params) + device = DEV_MAP[disk.dev_type](disk.physical_id, children, disk.size, + dev_params) if not device.attached: return None return device -def Assemble(dev_type, unique_id, children, size): +def Assemble(disk, children): """Try to attach or assemble an existing device. This will attach to assemble the device, as needed, to bring it fully up. It must be safe to run on already-assembled devices. + @type disk: L{objects.Disk} + @param disk: the disk object to assemble + @type children: list of L{bdev.BlockDev} + @param children: the list of block devices that are children of the device + represented by the disk parameter + """ - 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, size) + _VerifyDiskType(disk.dev_type) + dev_params = objects.FillDict(constants.DISK_LD_DEFAULTS[disk.dev_type], + disk.params) + device = DEV_MAP[disk.dev_type](disk.physical_id, children, disk.size, + dev_params) device.Assemble() return device -def Create(dev_type, unique_id, children, size): +def Create(disk, children): """Create a device. + @type disk: L{objects.Disk} + @param disk: the disk object to create + @type children: list of L{bdev.BlockDev} + @param children: the list of block devices that are children of the device + represented by the disk parameter + """ - if dev_type not in DEV_MAP: - raise errors.ProgrammerError("Invalid block device type '%s'" % dev_type) - device = DEV_MAP[dev_type].Create(unique_id, children, size) + _VerifyDiskType(disk.dev_type) + dev_params = objects.FillDict(constants.DISK_LD_DEFAULTS[disk.dev_type], + disk.params) + device = DEV_MAP[disk.dev_type].Create(disk.physical_id, children, disk.size, + dev_params) return device