Get rid of constants.HT_HVM_DEFAULT_BOOT_ORDER

[ganeti-local] / lib / bdev.py

diff --git a/lib/bdev.py b/lib/bdev.py
index 7409493..834d7b3 100644 (file)
--- a/lib/bdev.py
+++ b/lib/bdev.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#

 #
 
 # Copyright (C) 2006, 2007 Google Inc.
 #
 
 # Copyright (C) 2006, 2007 Google Inc.

@@ -24,10 +24,13 @@
 import re
 import time
 import errno
 import re
 import time
 import errno

+import pyparsing as pyp
+import os
+import logging

 
 from ganeti import utils
 
 from ganeti import utils

-from ganeti import logger

 from ganeti import errors
 from ganeti import errors

+from ganeti import constants

 
 
 class BlockDev(object):
 
 
 class BlockDev(object):

@@ -40,21 +43,16 @@ class BlockDev(object):
     - online (=used, or ready for use)
 
   A device can also be online but read-only, however we are not using
     - online (=used, or ready for use)
 
   A device can also be online but read-only, however we are not using

-  the readonly state (MD and LV have it, if needed in the future)
-  and we are usually looking at this like at a stack, so it's easier
-  to conceptualise the transition from not-existing to online and back
+  the readonly state (LV has it, if needed in the future) and we are
+  usually looking at this like at a stack, so it's easier to
+  conceptualise the transition from not-existing to online and back

   like a linear one.
 
   The many different states of the device are due to the fact that we
   need to cover many device types:
     - logical volumes are created, lvchange -a y $lv, and used
   like a linear one.
 
   The many different states of the device are due to the fact that we
   need to cover many device types:
     - logical volumes are created, lvchange -a y $lv, and used

-    - md arrays are created or assembled and used

     - drbd devices are attached to a local disk/remote peer and made primary
 
     - drbd devices are attached to a local disk/remote peer and made primary
 

-  The status of the device can be examined by `GetStatus()`, which
-  returns a numerical value, depending on the position in the
-  transition stack of the device.
-

   A block device is identified by three items:
     - the /dev path of the device (dynamic)
     - a unique ID of the device (static)
   A block device is identified by three items:
     - the /dev path of the device (dynamic)
     - a unique ID of the device (static)

@@ -62,15 +60,13 @@ class BlockDev(object):
 
   Not all devices implement both the first two as distinct items. LVM
   logical volumes have their unique ID (the pair volume group, logical
 
   Not all devices implement both the first two as distinct items. LVM
   logical volumes have their unique ID (the pair volume group, logical

-  volume name) in a 1-to-1 relation to the dev path. For MD devices,
-  the /dev path is dynamic and the unique ID is the UUID generated at
-  array creation plus the slave list. For DRBD devices, the /dev path
-  is again dynamic and the unique id is the pair (host1, dev1),
-  (host2, dev2).
+  volume name) in a 1-to-1 relation to the dev path. For DRBD devices,
+  the /dev path is again dynamic and the unique id is the pair (host1,
+  dev1), (host2, dev2).

 
   You can get to a device in two ways:
     - creating the (real) device, which returns you
 
   You can get to a device in two ways:
     - creating the (real) device, which returns you

-      an attached instance (lvcreate, mdadm --create)
+      an attached instance (lvcreate)

     - attaching of a python instance to an existing (real) device
 
   The second point, the attachement to a device, is different
     - attaching of a python instance to an existing (real) device
 
   The second point, the attachement to a device, is different

@@ -80,56 +76,27 @@ class BlockDev(object):
   after assembly we'll have our correct major/minor.
 
   """
   after assembly we'll have our correct major/minor.
 
   """

-
-  STATUS_UNKNOWN = 0
-  STATUS_EXISTING = 1
-  STATUS_STANDBY = 2
-  STATUS_ONLINE = 3
-
-  STATUS_MAP = {
-    STATUS_UNKNOWN: "unknown",
-    STATUS_EXISTING: "existing",
-    STATUS_STANDBY: "ready for use",
-    STATUS_ONLINE: "online",
-    }
-
-

   def __init__(self, unique_id, children):
     self._children = children
     self.dev_path = None
     self.unique_id = unique_id
     self.major = None
     self.minor = None
   def __init__(self, unique_id, children):
     self._children = children
     self.dev_path = None
     self.unique_id = unique_id
     self.major = None
     self.minor = None

-
+    self.attached = False

 
   def Assemble(self):
     """Assemble the device from its components.
 
 
   def Assemble(self):
     """Assemble the device from its components.
 

-    If this is a plain block device (e.g. LVM) than assemble does
-    nothing, as the LVM has no children and we don't put logical
-    volumes offline.
-
-    One guarantee is that after the device has been assembled, it
-    knows its major/minor numbers. This allows other devices (usually
-    parents) to probe correctly for their children.
+    Implementations of this method by child classes must ensure that:
+      - after the device has been assembled, it knows its major/minor
+        numbers; this allows other devices (usually parents) to probe
+        correctly for their children
+      - calling this method on an existing, in-use device is safe
+      - if the device is already configured (and in an OK state),
+        this method is idempotent

 
     """
 
     """

-    status = True
-    for child in self._children:
-      if not isinstance(child, BlockDev):
-        raise TypeError("Invalid child passed of type '%s'" % type(child))
-      if not status:
-        break
-      status = status and child.Assemble()
-      if not status:
-        break
-      status = status and child.Open()
-
-    if not status:
-      for child in self._children:
-        child.Shutdown()
-    return status
-
+    return True

 
   def Attach(self):
     """Find a device which matches our config and attach to it.
 
   def Attach(self):
     """Find a device which matches our config and attach to it.

@@ -137,14 +104,12 @@ class BlockDev(object):
     """
     raise NotImplementedError
 
     """
     raise NotImplementedError
 

-

   def Close(self):
     """Notifies that the device will no longer be used for I/O.
 
     """
     raise NotImplementedError
 
   def Close(self):
     """Notifies that the device will no longer be used for I/O.
 
     """
     raise NotImplementedError
 

-

   @classmethod
   def Create(cls, unique_id, children, size):
     """Create the device.
   @classmethod
   def Create(cls, unique_id, children, size):
     """Create the device.

@@ -159,25 +124,24 @@ class BlockDev(object):
     """
     raise NotImplementedError
 
     """
     raise NotImplementedError
 

-

   def Remove(self):
     """Remove this device.
 
   def Remove(self):
     """Remove this device.
 

-    This makes sense only for some of the device types: LV and to a
-    lesser degree, md devices. Also note that if the device can't
-    attach, the removal can't be completed.
+    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
+    can't be completed.

 
     """
     raise NotImplementedError
 
 
     """
     raise NotImplementedError
 

+  def Rename(self, new_id):
+    """Rename this device.

 
 

-  def GetStatus(self):
-    """Return the status of the device.
+    This may or may not make sense for a given device type.

 
     """
     raise NotImplementedError
 
 
     """
     raise NotImplementedError
 

-

   def Open(self, force=False):
     """Make the device ready for use.
 
   def Open(self, force=False):
     """Make the device ready for use.
 

@@ -190,7 +154,6 @@ class BlockDev(object):
     """
     raise NotImplementedError
 
     """
     raise NotImplementedError
 

-

   def Shutdown(self):
     """Shut down the device, freeing its children.
 
   def Shutdown(self):
     """Shut down the device, freeing its children.
 

@@ -201,7 +164,6 @@ class BlockDev(object):
     """
     raise NotImplementedError
 
     """
     raise NotImplementedError
 

-

   def SetSyncSpeed(self, speed):
     """Adjust the sync speed of the mirror.
 
   def SetSyncSpeed(self, speed):
     """Adjust the sync speed of the mirror.
 

@@ -214,25 +176,30 @@ class BlockDev(object):
         result = result and child.SetSyncSpeed(speed)
     return result
 
         result = result and child.SetSyncSpeed(speed)
     return result
 

-

   def GetSyncStatus(self):
     """Returns the sync status of the device.
 
     If this device is a mirroring device, this function returns the
     status of the mirror.
 
   def GetSyncStatus(self):
     """Returns the sync status of the device.
 
     If this device is a mirroring device, this function returns the
     status of the mirror.
 

-    Returns:
-     (sync_percent, estimated_time, is_degraded)
+    If sync_percent is None, it means the device is not syncing.

 
 

-    If sync_percent is None, it means all is ok

     If estimated_time is None, it means we can't estimate
     If estimated_time is None, it means we can't estimate

-    the time needed, otherwise it's the time left in seconds
+    the time needed, otherwise it's the time left in seconds.
+

     If is_degraded is True, it means the device is missing
     redundancy. This is usually a sign that something went wrong in
     the device setup, if sync_percent is None.
 
     If is_degraded is True, it means the device is missing
     redundancy. This is usually a sign that something went wrong in
     the device setup, if sync_percent is None.
 

+    The ldisk parameter represents the degradation of the local
+    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)
+

     """
     """

-    return None, None, False
+    return None, None, False, False

 
 
   def CombinedSyncStatus(self):
 
 
   def CombinedSyncStatus(self):

@@ -243,10 +210,10 @@ class BlockDev(object):
     children.
 
     """
     children.
 
     """

-    min_percent, max_time, is_degraded = self.GetSyncStatus()
+    min_percent, max_time, is_degraded, ldisk = self.GetSyncStatus()

     if self._children:
       for child in self._children:
     if self._children:
       for child in self._children:

-        c_percent, c_time, c_degraded = child.GetSyncStatus()
+        c_percent, c_time, c_degraded, c_ldisk = child.GetSyncStatus()

         if min_percent is None:
           min_percent = c_percent
         elif c_percent is not None:
         if min_percent is None:
           min_percent = c_percent
         elif c_percent is not None:

@@ -256,8 +223,26 @@ class BlockDev(object):
         elif c_time is not None:
           max_time = max(max_time, c_time)
         is_degraded = is_degraded or c_degraded
         elif c_time is not None:
           max_time = max(max_time, c_time)
         is_degraded = is_degraded or c_degraded

-    return min_percent, max_time, is_degraded
+        ldisk = ldisk or c_ldisk
+    return min_percent, max_time, is_degraded, ldisk
+
+
+  def SetInfo(self, text):
+    """Update metadata with info text.
+
+    Only supported for some device types.
+
+    """
+    for child in self._children:
+      child.SetInfo(text)

 
 

+  def Grow(self, amount):
+    """Grow the block device.
+
+    @param amount: the amount (in mebibytes) to grow with
+
+    """
+    raise NotImplementedError

 
   def __repr__(self):
     return ("<%s: unique_id: %s, children: %s, %s:%s, %s>" %
 
   def __repr__(self):
     return ("<%s: unique_id: %s, children: %s, %s:%s, %s>" %

@@ -280,21 +265,23 @@ class LogicalVolume(BlockDev):
       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)
       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.Attach()
 
     self.Attach()
 

-

   @classmethod
   def Create(cls, unique_id, children, size):
     """Create a new logical volume.
 
     """
     if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 2:
   @classmethod
   def Create(cls, unique_id, children, size):
     """Create a new logical volume.
 
     """
     if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 2:

-      raise ValueError("Invalid configuration data %s" % str(unique_id))
+      raise errors.ProgrammerError("Invalid configuration data %s" %
+                                   str(unique_id))

     vg_name, lv_name = unique_id
     pvs_info = cls.GetPVInfo(vg_name)
     if not pvs_info:
     vg_name, lv_name = unique_id
     pvs_info = cls.GetPVInfo(vg_name)
     if not pvs_info:

-      raise errors.BlockDeviceError, ("Can't compute PV info for vg %s" %
-                                      vg_name)
+      raise errors.BlockDeviceError("Can't compute PV info for vg %s" %
+                                    vg_name)

     pvs_info.sort()
     pvs_info.reverse()
 
     pvs_info.sort()
     pvs_info.reverse()
 

@@ -304,36 +291,38 @@ class LogicalVolume(BlockDev):
     # The size constraint should have been checked from the master before
     # calling the create function.
     if free_size < size:
     # The size constraint should have been checked from the master before
     # calling the create function.
     if free_size < size:

-      raise errors.BlockDeviceError, ("Not enough free space: required %s,"
-                                      " available %s" % (size, free_size))
+      raise errors.BlockDeviceError("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)
     if result.failed:
     result = utils.RunCmd(["lvcreate", "-L%dm" % size, "-n%s" % lv_name,
                            vg_name] + pvlist)
     if result.failed:

-      raise errors.BlockDeviceError(result.fail_reason)
+      raise errors.BlockDeviceError("LV create failed (%s): %s" %
+                                    (result.fail_reason, result.output))

     return LogicalVolume(unique_id, children)
 
   @staticmethod
   def GetPVInfo(vg_name):
     """Get the free space info for PVs in a volume group.
 
     return LogicalVolume(unique_id, children)
 
   @staticmethod
   def GetPVInfo(vg_name):
     """Get the free space info for PVs in a volume group.
 

-    Args:
-      vg_name: the volume group name
+    @param vg_name: the volume group name
+
+    @rtype: list
+    @return: list of tuples (free_space, name) with free_space in mebibytes

 
 

-    Returns:
-      list of (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:
     """
     command = ["pvs", "--noheadings", "--nosuffix", "--units=m",
                "-opv_name,vg_name,pv_free,pv_attr", "--unbuffered",
                "--separator=:"]
     result = utils.RunCmd(command)
     if result.failed:

-      logger.Error("Can't get the PV information: %s" % result.fail_reason)
+      logging.error("Can't get the PV information: %s - %s",
+                    result.fail_reason, result.output)

       return None
     data = []
     for line in result.stdout.splitlines():
       fields = line.strip().split(':')
       if len(fields) != 4:
       return None
     data = []
     for line in result.stdout.splitlines():
       fields = line.strip().split(':')
       if len(fields) != 4:

-        logger.Error("Can't parse pvs output: line '%s'" % line)
+        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':
         return None
       # skip over pvs from another vg or ones which are not allocatable
       if fields[1] != vg_name or fields[3][0] != 'a':

@@ -352,43 +341,82 @@ class LogicalVolume(BlockDev):
     result = utils.RunCmd(["lvremove", "-f", "%s/%s" %
                            (self._vg_name, self._lv_name)])
     if result.failed:
     result = utils.RunCmd(["lvremove", "-f", "%s/%s" %
                            (self._vg_name, self._lv_name)])
     if result.failed:

-      logger.Error("Can't lvremove: %s" % result.fail_reason)
+      logging.error("Can't lvremove: %s - %s",
+                    result.fail_reason, result.output)

 
     return not result.failed
 
 
     return not result.failed
 

+  def Rename(self, new_id):
+    """Rename this logical volume.
+
+    """
+    if not isinstance(new_id, (tuple, list)) or len(new_id) != 2:
+      raise errors.ProgrammerError("Invalid new logical id '%s'" % new_id)
+    new_vg, new_name = new_id
+    if new_vg != self._vg_name:
+      raise errors.ProgrammerError("Can't move a logical volume across"
+                                   " volume groups (from %s to to %s)" %
+                                   (self._vg_name, new_vg))
+    result = utils.RunCmd(["lvrename", new_vg, self._lv_name, new_name])
+    if result.failed:
+      raise errors.BlockDeviceError("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)

 
   def Attach(self):
     """Attach to an existing LV.
 
     This method will try to see if an existing and active LV exists
 
   def Attach(self):
     """Attach to an existing LV.
 
     This method will try to see if an existing and active LV exists

-    which matches the our name. If so, its major/minor will be
+    which matches our name. If so, its major/minor will be

     recorded.
 
     """
     recorded.
 
     """

-    result = utils.RunCmd(["lvdisplay", self.dev_path])
+    self.attached = False
+    result = utils.RunCmd(["lvs", "--noheadings", "--separator=,",
+                           "-olv_attr,lv_kernel_major,lv_kernel_minor",
+                           self.dev_path])

     if result.failed:
     if result.failed:

-      logger.Error("Can't find LV %s: %s" %
-                   (self.dev_path, result.fail_reason))
+      logging.error("Can't find LV %s: %s, %s",
+                    self.dev_path, result.fail_reason, result.output)
+      return False
+    out = result.stdout.strip().rstrip(',')
+    out = out.split(",")
+    if len(out) != 3:
+      logging.error("Can't parse LVS output, len(%s) != 3", str(out))
+      return False
+
+    status, major, minor = out[:3]
+    if len(status) != 6:
+      logging.error("lvs lv_attr is not 6 characters (%s)", status)

       return False
       return False

-    match = re.compile("^ *Block device *([0-9]+):([0-9]+).*$")
-    for line in result.stdout.splitlines():
-      match_result = match.match(line)
-      if match_result:
-        self.major = int(match_result.group(1))
-        self.minor = int(match_result.group(2))
-        return True
-    return False

 
 

+    try:
+      major = int(major)
+      minor = int(minor)
+    except ValueError, err:
+      logging.error("lvs major/minor cannot be parsed: %s", str(err))
+
+    self.major = major
+    self.minor = minor
+    self._degraded = status[0] == 'v' # virtual volume, i.e. doesn't backing
+                                      # storage
+    self.attached = True
+    return True

 
   def Assemble(self):
     """Assemble the device.
 
 
   def Assemble(self):
     """Assemble the device.
 

-    This is a no-op for the LV device type. Eventually, we could
-    lvchange -ay here if we see that the LV is not active.
+    We alway 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).

 
     """
 
     """

-    return True
-
+    result = utils.RunCmd(["lvchange", "-ay", self.dev_path])
+    if result.failed:
+      logging.error("Can't activate lv %s: %s", self.dev_path, result.output)
+      return False
+    return self.Attach()

 
   def Shutdown(self):
     """Shutdown the device.
 
   def Shutdown(self):
     """Shutdown the device.

@@ -399,35 +427,30 @@ class LogicalVolume(BlockDev):
     """
     return True
 
     """
     return True
 

+  def GetSyncStatus(self):
+    """Returns the sync status of the device.

 
 

-  def GetStatus(self):
-    """Return the status of the device.
+    If this device is a mirroring device, this function returns the
+    status of the mirror.

 
 

-    Logical volumes will can be in all four states, although we don't
-    deactivate (lvchange -an) them when shutdown, so STATUS_EXISTING
-    should not be seen for our devices.
+    For logical volumes, sync_percent and estimated_time are always
+    None (no recovery in progress, as we don't handle the mirrored LV
+    case). The is_degraded parameter is the inverse of the ldisk
+    parameter.

 
 

-    """
-    result = utils.RunCmd(["lvs", "--noheadings", "-olv_attr", self.dev_path])
-    if result.failed:
-      logger.Error("Can't display lv: %s" % result.fail_reason)
-      return self.STATUS_UNKNOWN
-    out = result.stdout.strip()
-    # format: type/permissions/alloc/fixed_minor/state/open
-    if len(out) != 6:
-      return self.STATUS_UNKNOWN
-    #writable = (out[1] == "w")
-    active = (out[4] == "a")
-    online = (out[5] == "o")
-    if online:
-      retval = self.STATUS_ONLINE
-    elif active:
-      retval = self.STATUS_STANDBY
-    else:
-      retval = self.STATUS_EXISTING
+    For the ldisk parameter, we check if the logical volume has the
+    'virtual' type, which means it's not backed by existing storage
+    anymore (read from it return I/O error). This happens after a
+    physical disk failure and subsequent 'vgreduce --removemissing' on
+    the volume group.

 
 

-    return retval
+    The status was already read in Attach, so we just return it.

 
 

+    @rtype: tuple
+    @return: (sync_percent, estimated_time, is_degraded, ldisk)
+
+    """
+    return None, None, self._degraded, self._degraded

 
   def Open(self, force=False):
     """Make the device ready for I/O.
 
   def Open(self, force=False):
     """Make the device ready for I/O.

@@ -435,8 +458,7 @@ class LogicalVolume(BlockDev):
     This is a no-op for the LV device type.
 
     """
     This is a no-op for the LV device type.
 
     """

-    return True
-
+    pass

 
   def Close(self):
     """Notifies that the device will no longer be used for I/O.
 
   def Close(self):
     """Notifies that the device will no longer be used for I/O.

@@ -444,14 +466,12 @@ class LogicalVolume(BlockDev):
     This is a no-op for the LV device type.
 
     """
     This is a no-op for the LV device type.
 
     """

-    return True
-
+    pass

 
   def Snapshot(self, size):
     """Create a snapshot copy of an lvm block device.
 
     """
 
   def Snapshot(self, size):
     """Create a snapshot copy of an lvm block device.
 
     """

-

     snap_name = self._lv_name + ".snap"
 
     # remove existing snapshot if found
     snap_name = self._lv_name + ".snap"
 
     # remove existing snapshot if found

@@ -460,514 +480,475 @@ class LogicalVolume(BlockDev):
 
     pvs_info = self.GetPVInfo(self._vg_name)
     if not pvs_info:
 
     pvs_info = self.GetPVInfo(self._vg_name)
     if not pvs_info:

-      raise errors.BlockDeviceError, ("Can't compute PV info for vg %s" %
-                                      self._vg_name)
+      raise errors.BlockDeviceError("Can't compute PV info for vg %s" %
+                                    self._vg_name)

     pvs_info.sort()
     pvs_info.reverse()
     free_size, pv_name = pvs_info[0]
     if free_size < size:
     pvs_info.sort()
     pvs_info.reverse()
     free_size, pv_name = pvs_info[0]
     if free_size < size:

-      raise errors.BlockDeviceError, ("Not enough free space: required %s,"
-                                      " available %s" % (size, free_size))
+      raise errors.BlockDeviceError("Not enough free space: required %s,"
+                                    " available %s" % (size, free_size))

 
     result = utils.RunCmd(["lvcreate", "-L%dm" % size, "-s",
                            "-n%s" % snap_name, self.dev_path])
     if result.failed:
 
     result = utils.RunCmd(["lvcreate", "-L%dm" % size, "-s",
                            "-n%s" % snap_name, self.dev_path])
     if result.failed:

-      raise errors.BlockDeviceError, ("command: %s error: %s" %
-                                      (result.cmd, result.fail_reason))
+      raise errors.BlockDeviceError("command: %s error: %s - %s" %
+                                    (result.cmd, result.fail_reason,
+                                     result.output))

 
     return snap_name
 
 
     return snap_name
 

+  def SetInfo(self, text):
+    """Update metadata with info text.

 
 

-class MDRaid1(BlockDev):
-  """raid1 device implemented via md.
-
-  """
-  def __init__(self, unique_id, children):
-    super(MDRaid1, self).__init__(unique_id, children)
-    self.major = 9
-    self.Attach()
+    """
+    BlockDev.SetInfo(self, text)

 
 

+    # Replace invalid characters
+    text = re.sub('^[^A-Za-z0-9_+.]', '_', text)
+    text = re.sub('[^-A-Za-z0-9_+.]', '_', text)

 
 

-  def Attach(self):
-    """Find an array which matches our config and attach to it.
+    # Only up to 128 characters are allowed
+    text = text[:128]

 
 

-    This tries to find a MD array which has the same UUID as our own.
+    result = utils.RunCmd(["lvchange", "--addtag", text,
+                           self.dev_path])
+    if result.failed:
+      raise errors.BlockDeviceError("Command: %s error: %s - %s" %
+                                    (result.cmd, result.fail_reason,
+                                     result.output))
+  def Grow(self, amount):
+    """Grow the logical volume.

 
     """
 
     """

-    minor = self._FindMDByUUID(self.unique_id)
-    if minor is not None:
-      self._SetFromMinor(minor)
-    else:
-      self.minor = None
-      self.dev_path = None
-
-    return (minor is not None)
+    # 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
+    # supports 'cling'
+    for alloc_policy in "contiguous", "cling", "normal":
+      result = utils.RunCmd(["lvextend", "--alloc", alloc_policy,
+                             "-L", "+%dm" % amount, self.dev_path])
+      if not result.failed:
+        return
+    raise errors.BlockDeviceError("Can't grow LV %s: %s" %
+                                  (self.dev_path, result.output))

 
 
 
 

-  @staticmethod
-  def _GetUsedDevs():
-    """Compute the list of in-use MD devices.
+class DRBD8Status(object):
+  """A DRBD status representation class.

 
 

-    It doesn't matter if the used device have other raid level, just
-    that they are in use.
+  Note that this doesn't support unconfigured devices (cs:Unconfigured).

 
 

-    """
-    mdstat = open("/proc/mdstat", "r")
-    data = mdstat.readlines()
-    mdstat.close()
+  """
+  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+)"
+                       "\s+ds:([^/]+)/(\S+)\s+.*$")
+  SYNC_RE = re.compile(r"^.*\ssync'ed:\s*([0-9.]+)%.*"
+                       "\sfinish: ([0-9]+):([0-9]+):([0-9]+)\s.*$")
+
+  def __init__(self, procline):
+    u = self.UNCONF_RE.match(procline)
+    if u:
+      self.cstatus = "Unconfigured"
+      self.lrole = self.rrole = self.ldisk = self.rdisk = None
+    else:
+      m = self.LINE_RE.match(procline)
+      if not m:
+        raise errors.BlockDeviceError("Can't parse input data '%s'" % procline)
+      self.cstatus = m.group(1)
+      self.lrole = m.group(2)
+      self.rrole = m.group(3)
+      self.ldisk = m.group(4)
+      self.rdisk = m.group(5)
+
+    # 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.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_in_resync = self.cstatus in ("SyncSource", "SyncTarget")
+    self.is_in_use = self.cstatus != "Unconfigured"
+
+    m = self.SYNC_RE.match(procline)
+    if m:
+      self.sync_percent = float(m.group(1))
+      hours = int(m.group(2))
+      minutes = int(m.group(3))
+      seconds = int(m.group(4))
+      self.est_time = hours * 3600 + minutes * 60 + seconds
+    else:
+      self.sync_percent = None
+      self.est_time = None

 
 

-    used_md = {}
-    valid_line = re.compile("^md([0-9]+) : .*$")
-    for line in data:
-      match = valid_line.match(line)
-      if match:
-        md_no = int(match.group(1))
-        used_md[md_no] = line
+    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

 
 

-    return used_md

 
 

+class BaseDRBD(BlockDev):
+  """Base DRBD class.

 
 

-  @staticmethod
-  def _GetDevInfo(minor):
-    """Get info about a MD device.
+  This class contains a few bits of common functionality between the
+  0.7 and 8.x versions of DRBD.

 
 

-    Currently only uuid is returned.
+  """
+  _VERSION_RE = re.compile(r"^version: (\d+)\.(\d+)\.(\d+)"
+                           r" \(api:(\d+)/proto:(\d+)(?:-(\d+))?\)")

 
 

-    """
-    result = utils.RunCmd(["mdadm", "-D", "/dev/md%d" % minor])
-    if result.failed:
-      logger.Error("Can't display md: %s" % result.fail_reason)
-      return None
-    retval = {}
-    for line in result.stdout.splitlines():
-      line = line.strip()
-      kv = line.split(" : ", 1)
-      if kv:
-        if kv[0] == "UUID":
-          retval["uuid"] = kv[1]
-        elif kv[0] == "State":
-          retval["state"] = kv[1].split(", ")
-    return retval
+  _DRBD_MAJOR = 147
+  _ST_UNCONFIGURED = "Unconfigured"
+  _ST_WFCONNECTION = "WFConnection"
+  _ST_CONNECTED = "Connected"

 
 

+  _STATUS_FILE = "/proc/drbd"

 
   @staticmethod
 
   @staticmethod

-  def _FindUnusedMinor():
-    """Compute an unused MD minor.
-
-    This code assumes that there are 256 minors only.
+  def _GetProcData(filename=_STATUS_FILE):
+    """Return data from /proc/drbd.

 
     """
 
     """

-    used_md = MDRaid1._GetUsedDevs()
-    i = 0
-    while i < 256:
-      if i not in used_md:
-        break
-      i += 1
-    if i == 256:
-      logger.Error("Critical: Out of md minor numbers.")
-      return None
-    return i
+    stat = open(filename, "r")
+    try:
+      data = stat.read().splitlines()
+    finally:
+      stat.close()
+    if not data:
+      raise errors.BlockDeviceError("Can't read any data from %s" % filename)
+    return data

 
 

+  @staticmethod
+  def _MassageProcData(data):
+    """Transform the output of _GetProdData into a nicer form.

 
 

-  @classmethod
-  def _FindMDByUUID(cls, uuid):
-    """Find the minor of an MD array with a given UUID.
+    @return: a dictionary of minor: joined lines from /proc/drbd
+        for that minor

 
     """
 
     """

-    md_list = cls._GetUsedDevs()
-    for minor in md_list:
-      info = cls._GetDevInfo(minor)
-      if info and info["uuid"] == uuid:
-        return minor
-    return None
-
+    lmatch = re.compile("^ *([0-9]+):.*$")
+    results = {}
+    old_minor = old_line = None
+    for line in data:
+      lresult = lmatch.match(line)
+      if lresult is not None:
+        if old_minor is not None:
+          results[old_minor] = old_line
+        old_minor = int(lresult.group(1))
+        old_line = line
+      else:
+        if old_minor is not None:
+          old_line += " " + line.strip()
+    # add last line
+    if old_minor is not None:
+      results[old_minor] = old_line
+    return results

 
   @classmethod
 
   @classmethod

-  def Create(cls, unique_id, children, size):
-    """Create a new MD raid1 array.
-
-    """
-    if not isinstance(children, (tuple, list)):
-      raise ValueError("Invalid setup data for MDRaid1 dev: %s" %
-                       str(children))
-    for i in children:
-      if not isinstance(i, BlockDev):
-        raise ValueError("Invalid member in MDRaid1 dev: %s" % type(i))
-    for i in children:
-      result = utils.RunCmd(["mdadm", "--zero-superblock", "--force",
-                             i.dev_path])
-      if result.failed:
-        logger.Error("Can't zero superblock: %s" % result.fail_reason)
-        return None
-    minor = cls._FindUnusedMinor()
-    result = utils.RunCmd(["mdadm", "--create", "/dev/md%d" % minor,
-                           "--auto=yes", "--force", "-l1",
-                           "-n%d" % len(children)] +
-                          [dev.dev_path for dev in children])
+  def _GetVersion(cls):
+    """Return the DRBD version.
+
+    This will return a dict with keys:
+      - k_major
+      - k_minor
+      - k_point
+      - api
+      - proto
+      - 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:
+      raise errors.BlockDeviceError("Can't parse DRBD version from '%s'" %
+                                    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]),
+             }
+    if values[5] is not None:
+      retval['proto2'] = values[5]

 
 

-    if result.failed:
-      logger.Error("Can't create md: %s" % result.fail_reason)
-      return None
-    info = cls._GetDevInfo(minor)
-    if not info or not "uuid" in info:
-      logger.Error("Wrong information returned from mdadm -D: %s" % str(info))
-      return None
-    return MDRaid1(info["uuid"], children)
+    return retval

 
 

+  @staticmethod
+  def _DevPath(minor):
+    """Return the path to a drbd device for a given minor.

 
 

-  def Remove(self):
-    """Stub remove function for MD RAID 1 arrays.
+    """
+    return "/dev/drbd%d" % minor

 
 

-    We don't remove the superblock right now. Mark a to do.
+  @classmethod
+  def GetUsedDevs(cls):
+    """Compute the list of used DRBD devices.

 
     """
 
     """

-    #TODO: maybe zero superblock on child devices?
-    return self.Shutdown()
-
+    data = cls._GetProcData()

 
 

-  def AddChild(self, device):
-    """Add a new member to the md raid1.
+    used_devs = {}
+    valid_line = re.compile("^ *([0-9]+): cs:([^ ]+).*$")
+    for line in data:
+      match = valid_line.match(line)
+      if not match:
+        continue
+      minor = int(match.group(1))
+      state = match.group(2)
+      if state == cls._ST_UNCONFIGURED:
+        continue
+      used_devs[minor] = state, line

 
 

-    """
-    if self.minor is None and not self.Attach():
-      raise errors.BlockDeviceError, "Can't attach to device"
-    if device.dev_path is None:
-      raise errors.BlockDeviceError, "New child is not initialised"
-    result = utils.RunCmd(["mdadm", "-a", self.dev_path, device.dev_path])
-    if result.failed:
-      raise errors.BlockDeviceError, ("Failed to add new device to array: %s" %
-                                      result.output)
-    new_len = len(self._children) + 1
-    result = utils.RunCmd(["mdadm", "--grow", self.dev_path, "-n", new_len])
-    if result.failed:
-      raise errors.BlockDeviceError, ("Can't grow md array: %s" %
-                                      result.output)
-    self._children.append(device)
+    return used_devs

 
 

+  def _SetFromMinor(self, minor):
+    """Set our parameters based on the given minor.

 
 

-  def RemoveChild(self, dev_path):
-    """Remove member from the md raid1.
+    This sets our minor variable and our dev_path.

 
     """
 
     """

-    if self.minor is None and not self.Attach():
-      raise errors.BlockDeviceError, "Can't attach to device"
-    if len(self._children) == 1:
-      raise errors.BlockDeviceError, ("Can't reduce member when only one"
-                                      " child left")
-    for device in self._children:
-      if device.dev_path == dev_path:
-        break
+    if minor is None:
+      self.minor = self.dev_path = None
+      self.attached = False

     else:
     else:

-      raise errors.BlockDeviceError, "Can't find child with this path"
-    new_len = len(self._children) - 1
-    result = utils.RunCmd(["mdadm", "-f", self.dev_path, dev_path])
-    if result.failed:
-      raise errors.BlockDeviceError, ("Failed to mark device as failed: %s" %
-                                      result.output)
+      self.minor = minor
+      self.dev_path = self._DevPath(minor)
+      self.attached = True

 
 

-    # it seems here we need a short delay for MD to update its
-    # superblocks
-    time.sleep(0.5)
-    result = utils.RunCmd(["mdadm", "-r", self.dev_path, dev_path])
-    if result.failed:
-      raise errors.BlockDeviceError, ("Failed to remove device from array:"
-                                      " %s" % result.output)
-    result = utils.RunCmd(["mdadm", "--grow", "--force", self.dev_path,
-                           "-n", new_len])
+  @staticmethod
+  def _CheckMetaSize(meta_device):
+    """Check if the given meta device looks like a valid one.
+
+    This currently only check the size, which must be around
+    128MiB.
+
+    """
+    result = utils.RunCmd(["blockdev", "--getsize", meta_device])

     if result.failed:
     if result.failed:

-      raise errors.BlockDeviceError, ("Can't shrink md array: %s" %
-                                      result.output)
-    self._children.remove(device)
+      logging.error("Failed to get device size: %s - %s",
+                    result.fail_reason, result.output)
+      return False
+    try:
+      sectors = int(result.stdout)
+    except ValueError:
+      logging.error("Invalid output from blockdev: '%s'", result.stdout)
+      return False
+    bytes = sectors * 512
+    if bytes < 128 * 1024 * 1024: # less than 128MiB
+      logging.error("Meta device too small (%.2fMib)", (bytes / 1024 / 1024))
+      return False
+    if bytes > (128 + 32) * 1024 * 1024: # account for an extra (big) PE on LVM
+      logging.error("Meta device too big (%.2fMiB)", (bytes / 1024 / 1024))
+      return False
+    return True

 
 

+  def Rename(self, new_id):
+    """Rename a device.

 
 

-  def GetStatus(self):
-    """Return the status of the device.
+    This is not supported for drbd devices.

 
     """
 
     """

-    self.Attach()
-    if self.minor is None:
-      retval = self.STATUS_UNKNOWN
-    else:
-      retval = self.STATUS_ONLINE
-    return retval
+    raise errors.ProgrammerError("Can't rename a drbd device")

 
 
 
 

-  def _SetFromMinor(self, minor):
-    """Set our parameters based on the given minor.
+class DRBD8(BaseDRBD):
+  """DRBD v8.x block device.

 
 

-    This sets our minor variable and our dev_path.
+  This implements the local host part of the DRBD device, i.e. it
+  doesn't do anything to the supposed peer. If you need a fully
+  connected DRBD pair, you need to use this class on both hosts.

 
 

-    """
-    self.minor = minor
-    self.dev_path = "/dev/md%d" % minor
+  The unique_id for the drbd device is the (local_ip, local_port,
+  remote_ip, remote_port) tuple, and it must have two children: the
+  data device and the meta_device. The meta device is checked for
+  valid size and is zeroed on create.

 
 

+  """
+  _MAX_MINORS = 255
+  _PARSE_SHOW = None

 
 

-  def Assemble(self):
-    """Assemble the MD device.
+  # timeout constants
+  _NET_RECONFIG_TIMEOUT = 60

 
 

-    At this point we should have:
-      - list of children devices
-      - uuid
+  def __init__(self, unique_id, children):
+    if children and children.count(None) > 0:
+      children = []
+    super(DRBD8, self).__init__(unique_id, children)
+    self.major = self._DRBD_MAJOR
+    version = self._GetVersion()
+    if version['k_major'] != 8 :
+      raise errors.BlockDeviceError("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:
+      raise ValueError("Invalid configuration data %s" % str(unique_id))
+    (self._lhost, self._lport,
+     self._rhost, self._rport,
+     self._aminor, self._secret) = unique_id
+    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" %
+                       (unique_id,))
+    self.Attach()
+
+  @classmethod
+  def _InitMeta(cls, minor, dev_path):
+    """Initialize a meta device.
+
+    This will not work if the given minor is in use.

 
     """
 
     """

-    result = super(MDRaid1, self).Assemble()
-    if not result:
-      return result
-    md_list = self._GetUsedDevs()
-    for minor in md_list:
-      info = self._GetDevInfo(minor)
-      if info and info["uuid"] == self.unique_id:
-        self._SetFromMinor(minor)
-        logger.Info("MD array %s already started" % str(self))
-        return True
-    free_minor = self._FindUnusedMinor()
-    result = utils.RunCmd(["mdadm", "-A", "--auto=yes", "--uuid",
-                           self.unique_id, "/dev/md%d" % free_minor] +
-                          [bdev.dev_path for bdev in self._children])
+    result = utils.RunCmd(["drbdmeta", "--force", cls._DevPath(minor),
+                           "v08", dev_path, "0", "create-md"])

     if result.failed:
     if result.failed:

-      logger.Error("Can't assemble MD array: %s" % result.fail_reason)
-      self.minor = None
-    else:
-      self.minor = free_minor
-    return not result.failed
+      raise errors.BlockDeviceError("Can't initialize meta device: %s" %
+                                    result.output)

 
 

+  @classmethod
+  def _FindUnusedMinor(cls):
+    """Find an unused DRBD device.

 
 

-  def Shutdown(self):
-    """Tear down the MD array.
-
-    This does a 'mdadm --stop' so after this command, the array is no
-    longer available.
+    This is specific to 8.x as the minors are allocated dynamically,
+    so non-existing numbers up to a max minor count are actually free.

 
     """
 
     """

-    if self.minor is None and not self.Attach():
-      logger.Info("MD object not attached to a device")
-      return True
+    data = cls._GetProcData()

 
 

-    result = utils.RunCmd(["mdadm", "--stop", "/dev/md%d" % self.minor])
-    if result.failed:
-      logger.Error("Can't stop MD array: %s" % result.fail_reason)
-      return False
-    self.minor = None
-    self.dev_path = None
-    return True
+    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)
+      if match:
+        return int(match.group(1))
+      match = used_line.match(line)
+      if match:
+        minor = int(match.group(1))
+        highest = max(highest, minor)
+    if highest is None: # there are no minors in use at all
+      return 0
+    if highest >= cls._MAX_MINORS:
+      logging.error("Error: no free drbd minors!")
+      raise errors.BlockDeviceError("Can't find a free DRBD minor")
+    return highest + 1

 
 

+  @classmethod
+  def _GetShowParser(cls):
+    """Return a parser for `drbd show` output.

 
 

-  def SetSyncSpeed(self, kbytes):
-    """Set the maximum sync speed for the MD array.
+    This will either create or return an already-create parser for the
+    output of the command `drbd show`.

 
     """
 
     """

-    result = super(MDRaid1, self).SetSyncSpeed(kbytes)
-    if self.minor is None:
-      logger.Error("MD array not attached to a device")
-      return False
-    f = open("/sys/block/md%d/md/sync_speed_max" % self.minor, "w")
-    try:
-      f.write("%d" % kbytes)
-    finally:
-      f.close()
-    f = open("/sys/block/md%d/md/sync_speed_min" % self.minor, "w")
-    try:
-      f.write("%d" % (kbytes/2))
-    finally:
-      f.close()
-    return result
+    if cls._PARSE_SHOW is not None:
+      return cls._PARSE_SHOW

 
 

+    # pyparsing setup
+    lbrace = pyp.Literal("{").suppress()
+    rbrace = pyp.Literal("}").suppress()
+    semi = pyp.Literal(";").suppress()
+    # this also converts the value to an int
+    number = pyp.Word(pyp.nums).setParseAction(lambda s, l, t: int(t[0]))

 
 

-  def GetSyncStatus(self):
-    """Returns the sync status of the device.
+    comment = pyp.Literal ("#") + pyp.Optional(pyp.restOfLine)
+    defa = pyp.Literal("_is_default").suppress()
+    dbl_quote = pyp.Literal('"').suppress()

 
 

-    Returns:
-     (sync_percent, estimated_time)
+    keyword = pyp.Word(pyp.alphanums + '-')

 
 

-    If sync_percent is None, it means all is ok
-    If estimated_time is None, it means we can't esimate
-    the time needed, otherwise it's the time left in seconds
+    # value types
+    value = pyp.Word(pyp.alphanums + '_-/.:')
+    quoted = dbl_quote + pyp.CharsNotIn('"') + dbl_quote
+    addr_port = (pyp.Word(pyp.nums + '.') + pyp.Literal(':').suppress() +
+                 number)
+    # meta device, extended syntax
+    meta_value = ((value ^ quoted) + pyp.Literal('[').suppress() +
+                  number + pyp.Word(']').suppress())

 
 

-    """
-    if self.minor is None and not self.Attach():
-      raise errors.BlockDeviceError("Can't attach to device in GetSyncStatus")
-    dev_info = self._GetDevInfo(self.minor)
-    is_clean = ("state" in dev_info and
-                len(dev_info["state"]) == 1 and
-                dev_info["state"][0] in ("clean", "active"))
-    sys_path = "/sys/block/md%s/md/" % self.minor
-    f = file(sys_path + "sync_action")
-    sync_status = f.readline().strip()
-    f.close()
-    if sync_status == "idle":
-      return None, None, not is_clean
-    f = file(sys_path + "sync_completed")
-    sync_completed = f.readline().strip().split(" / ")
-    f.close()
-    if len(sync_completed) != 2:
-      return 0, None, not is_clean
-    sync_done, sync_total = [float(i) for i in sync_completed]
-    sync_percent = 100.0*sync_done/sync_total
-    f = file(sys_path + "sync_speed")
-    sync_speed_k = int(f.readline().strip())
-    if sync_speed_k == 0:
-      time_est = None
-    else:
-      time_est = (sync_total - sync_done) / 2 / sync_speed_k
-    return sync_percent, time_est, not is_clean
+    # a statement
+    stmt = (~rbrace + keyword + ~lbrace +
+            pyp.Optional(addr_port ^ value ^ quoted ^ meta_value) +
+            pyp.Optional(defa) + semi +
+            pyp.Optional(pyp.restOfLine).suppress())

 
 

+    # an entire section
+    section_name = pyp.Word(pyp.alphas + '_')
+    section = section_name + lbrace + pyp.ZeroOrMore(pyp.Group(stmt)) + rbrace

 
 

-  def Open(self, force=False):
-    """Make the device ready for I/O.
-
-    This is a no-op for the MDRaid1 device type, although we could use
-    the 2.6.18's new array_state thing.
-
-    """
-    return True
-
-
-  def Close(self):
-    """Notifies that the device will no longer be used for I/O.
-
-    This is a no-op for the MDRaid1 device type, but see comment for
-    `Open()`.
-
-    """
-    return True
-
-
-
-class DRBDev(BlockDev):
-  """DRBD block device.
-
-  This implements the local host part of the DRBD device, i.e. it
-  doesn't do anything to the supposed peer. If you need a fully
-  connected DRBD pair, you need to use this class on both hosts.
-
-  The unique_id for the drbd device is the (local_ip, local_port,
-  remote_ip, remote_port) tuple, and it must have two children: the
-  data device and the meta_device. The meta device is checked for
-  valid size and is zeroed on create.
-
-  """
-  _DRBD_MAJOR = 147
-  _ST_UNCONFIGURED = "Unconfigured"
-  _ST_WFCONNECTION = "WFConnection"
-  _ST_CONNECTED = "Connected"
-
-  def __init__(self, unique_id, children):
-    super(DRBDev, self).__init__(unique_id, children)
-    self.major = self._DRBD_MAJOR
-    if len(children) != 2:
-      raise ValueError("Invalid configuration data %s" % str(children))
-    if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 4:
-      raise ValueError("Invalid configuration data %s" % str(unique_id))
-    self._lhost, self._lport, self._rhost, self._rport = unique_id
-    self.Attach()
-
-  @staticmethod
-  def _DevPath(minor):
-    """Return the path to a drbd device for a given minor.
-
-    """
-    return "/dev/drbd%d" % minor
-
-  @staticmethod
-  def _GetProcData():
-    """Return data from /proc/drbd.
-
-    """
-    stat = open("/proc/drbd", "r")
-    data = stat.read().splitlines()
-    stat.close()
-    return data
-
-
-  @classmethod
-  def _GetUsedDevs(cls):
-    """Compute the list of used DRBD devices.
-
-    """
-    data = cls._GetProcData()
+    bnf = pyp.ZeroOrMore(pyp.Group(section ^ stmt))
+    bnf.ignore(comment)

 
 

-    used_devs = {}
-    valid_line = re.compile("^ *([0-9]+): cs:([^ ]+).*$")
-    for line in data:
-      match = valid_line.match(line)
-      if not match:
-        continue
-      minor = int(match.group(1))
-      state = match.group(2)
-      if state == cls._ST_UNCONFIGURED:
-        continue
-      used_devs[minor] = state, line
-
-    return used_devs
+    cls._PARSE_SHOW = bnf

 
 

+    return bnf

 
   @classmethod
 
   @classmethod

-  def _FindUnusedMinor(cls):
-    """Find an unused DRBD device.
+  def _GetShowData(cls, minor):
+    """Return the `drbdsetup show` data for a minor.

 
     """
 
     """

-    data = cls._GetProcData()
-
-    valid_line = re.compile("^ *([0-9]+): cs:Unconfigured$")
-    for line in data:
-      match = valid_line.match(line)
-      if match:
-        return int(match.group(1))
-    logger.Error("Error: no free drbd minors!")
-    return None
-
+    result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "show"])
+    if result.failed:
+      logging.error("Can't display the drbd config: %s - %s",
+                    result.fail_reason, result.output)
+      return None
+    return result.stdout

 
   @classmethod
 
   @classmethod

-  def _GetDevInfo(cls, minor):
-    """Get details about a given DRBD minor.
+  def _GetDevInfo(cls, out):
+    """Parse details about a given DRBD minor.

 
 

-    This return, if available, the local backing device in (major,
-    minor) formant and the local and remote (ip, port) information.
+    This return, if available, the local backing device (as a path)
+    and the local and remote (ip, port) information from a string
+    containing the output of the `drbdsetup show` command as returned
+    by _GetShowData.

 
     """
     data = {}
 
     """
     data = {}

-    result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "show"])
-    if result.failed:
-      logger.Error("Can't display the drbd config: %s" % result.fail_reason)
-      return data
-    out = result.stdout
-    if out == "Not configured\n":
+    if not out:

       return data
       return data

-    for line in out.splitlines():
-      if "local_dev" not in data:
-        match = re.match("^Lower device: ([0-9]+):([0-9]+) .*$", line)
-        if match:
-          data["local_dev"] = (int(match.group(1)), int(match.group(2)))
-          continue
-      if "meta_dev" not in data:
-        match = re.match("^Meta device: (([0-9]+):([0-9]+)|internal).*$", line)
-        if match:
-          if match.group(2) is not None and match.group(3) is not None:
-            # matched on the major/minor
-            data["meta_dev"] = (int(match.group(2)), int(match.group(3)))
-          else:
-            # matched on the "internal" string
-            data["meta_dev"] = match.group(1)
-            # in this case, no meta_index is in the output
-            data["meta_index"] = -1
-          continue
-      if "meta_index" not in data:
-        match = re.match("^Meta index: ([0-9]+).*$", line)
-        if match:
-          data["meta_index"] = int(match.group(1))
-          continue
-      if "local_addr" not in data:
-        match = re.match("^Local address: ([0-9.]+):([0-9]+)$", line)
-        if match:
-          data["local_addr"] = (match.group(1), int(match.group(2)))
-          continue
-      if "remote_addr" not in data:
-        match = re.match("^Remote address: ([0-9.]+):([0-9]+)$", line)
-        if match:
-          data["remote_addr"] = (match.group(1), int(match.group(2)))
-          continue
-    return data

 
 

+    bnf = cls._GetShowParser()
+    # run pyparse
+
+    try:
+      results = bnf.parseString(out)
+    except pyp.ParseException, err:
+      raise errors.BlockDeviceError("Can't parse drbdsetup show output: %s" %
+                                    str(err))
+
+    # and massage the results into our desired format
+    for section in results:
+      sname = section[0]
+      if sname == "_this_host":
+        for lst in section[1:]:
+          if lst[0] == "disk":
+            data["local_dev"] = lst[1]
+          elif lst[0] == "meta-disk":
+            data["meta_dev"] = lst[1]
+            data["meta_index"] = lst[2]
+          elif lst[0] == "address":
+            data["local_addr"] = tuple(lst[1:])
+      elif sname == "_remote_host":
+        for lst in section[1:]:
+          if lst[0] == "address":
+            data["remote_addr"] = tuple(lst[1:])
+    return data

 
   def _MatchesLocal(self, info):
     """Test if our local config matches with an existing device.
 
   def _MatchesLocal(self, info):
     """Test if our local config matches with an existing device.

@@ -978,25 +959,26 @@ class DRBDev(BlockDev):
     device.
 
     """
     device.
 
     """

-    if not ("local_dev" in info and "meta_dev" in info and
-            "meta_index" in info):
-      return False
+    if self._children:
+      backend, meta = self._children
+    else:
+      backend = meta = None

 
 

-    backend = self._children[0]

     if backend is not None:
     if backend is not None:

-      retval = (info["local_dev"] == (backend.major, backend.minor))
+      retval = ("local_dev" in info and info["local_dev"] == backend.dev_path)

     else:
     else:

-      retval = (info["local_dev"] == (0, 0))
-    meta = self._children[1]
+      retval = ("local_dev" not in info)
+

     if meta is not None:
     if meta is not None:

-      retval = retval and (info["meta_dev"] == (meta.major, meta.minor))
-      retval = retval and (info["meta_index"] == 0)
+      retval = retval and ("meta_dev" in info and
+                           info["meta_dev"] == meta.dev_path)
+      retval = retval and ("meta_index" in info and
+                           info["meta_index"] == 0)

     else:
     else:

-      retval = retval and (info["meta_dev"] == "internal" and
-                           info["meta_index"] == -1)
+      retval = retval and ("meta_dev" not in info and
+                           "meta_index" not in info)

     return retval
 
     return retval
 

-

   def _MatchesNet(self, info):
     """Test if our network config matches with an existing device.
 
   def _MatchesNet(self, info):
     """Test if our network config matches with an existing device.
 

@@ -1022,176 +1004,427 @@ class DRBDev(BlockDev):
               info["remote_addr"] == (self._rhost, self._rport))
     return retval
 
               info["remote_addr"] == (self._rhost, self._rport))
     return retval
 

+  @classmethod
+  def _AssembleLocal(cls, minor, backend, meta):
+    """Configure the local part of a DRBD device.

 
 

-  @staticmethod
-  def _IsValidMeta(meta_device):
-    """Check if the given meta device looks like a valid one.
+    """
+    args = ["drbdsetup", cls._DevPath(minor), "disk",
+            backend, meta, "0", "-e", "detach", "--create-device"]
+    result = utils.RunCmd(args)
+    if result.failed:
+      logging.error("Can't attach local disk: %s", result.output)
+    return not result.failed

 
 

-    This currently only check the size, which must be around
-    128MiB.
+  @classmethod
+  def _AssembleNet(cls, minor, net_info, protocol,
+                   dual_pri=False, hmac=None, secret=None):
+    """Configure the network part of the device.

 
     """
 
     """

-    result = utils.RunCmd(["blockdev", "--getsize", meta_device])
+    lhost, lport, rhost, rport = net_info
+    if None in net_info:
+      # we don't want network connection and actually want to make
+      # sure its shutdown
+      return cls._ShutdownNet(minor)
+
+    # Workaround for a race condition. When DRBD is doing its dance to
+    # establish a connection with its peer, it also sends the
+    # synchronization speed over the wire. In some cases setting the
+    # 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)
+
+    args = ["drbdsetup", cls._DevPath(minor), "net",
+            "%s:%s" % (lhost, lport), "%s:%s" % (rhost, rport), protocol,
+            "-A", "discard-zero-changes",
+            "-B", "consensus",
+            "--create-device",
+            ]
+    if dual_pri:
+      args.append("-m")
+    if hmac and secret:
+      args.extend(["-a", hmac, "-x", secret])
+    result = utils.RunCmd(args)

     if result.failed:
     if result.failed:

-      logger.Error("Failed to get device size: %s" % result.fail_reason)
-      return False
-    try:
-      sectors = int(result.stdout)
-    except ValueError:
-      logger.Error("Invalid output from blockdev: '%s'" % result.stdout)
-      return False
-    bytes = sectors * 512
-    if bytes < 128*1024*1024: # less than 128MiB
-      logger.Error("Meta device too small (%.2fMib)" % (bytes/1024/1024))
+      logging.error("Can't setup network for dbrd device: %s - %s",
+                    result.fail_reason, result.output)

       return False
       return False

-    if bytes > (128+32)*1024*1024: # account for an extra (big) PE on LVM
-      logger.Error("Meta device too big (%.2fMiB)" % (bytes/1024/1024))
+
+    timeout = time.time() + 10
+    ok = False
+    while time.time() < timeout:
+      info = cls._GetDevInfo(cls._GetShowData(minor))
+      if not "local_addr" in info or not "remote_addr" in info:
+        time.sleep(1)
+        continue
+      if (info["local_addr"] != (lhost, lport) or
+          info["remote_addr"] != (rhost, rport)):
+        time.sleep(1)
+        continue
+      ok = True
+      break
+    if not ok:
+      logging.error("Timeout while configuring network")

       return False
     return True
 
       return False
     return True
 

+  def AddChildren(self, devices):
+    """Add a disk to the DRBD device.
+
+    """
+    if self.minor is None:
+      raise errors.BlockDeviceError("Can't attach to dbrd8 during AddChildren")
+    if len(devices) != 2:
+      raise errors.BlockDeviceError("Need two devices for AddChildren")
+    info = self._GetDevInfo(self._GetShowData(self.minor))
+    if "local_dev" in info:
+      raise errors.BlockDeviceError("DRBD8 already attached to a local disk")
+    backend, meta = devices
+    if backend.dev_path is None or meta.dev_path is None:
+      raise errors.BlockDeviceError("Children not ready during AddChildren")
+    backend.Open()
+    meta.Open()
+    if not self._CheckMetaSize(meta.dev_path):
+      raise errors.BlockDeviceError("Invalid meta device size")
+    self._InitMeta(self._FindUnusedMinor(), meta.dev_path)
+
+    if not self._AssembleLocal(self.minor, backend.dev_path, meta.dev_path):
+      raise errors.BlockDeviceError("Can't attach to local storage")
+    self._children = devices
+
+  def RemoveChildren(self, devices):
+    """Detach the drbd device from local storage.
+
+    """
+    if self.minor is None:
+      raise errors.BlockDeviceError("Can't attach to drbd8 during"
+                                    " RemoveChildren")
+    # early return if we don't actually have backing storage
+    info = self._GetDevInfo(self._GetShowData(self.minor))
+    if "local_dev" not in info:
+      return
+    if len(self._children) != 2:
+      raise errors.BlockDeviceError("We don't have two children: %s" %
+                                    self._children)
+    if self._children.count(None) == 2: # we don't actually have children :)
+      logging.error("Requested detach while detached")
+      return
+    if len(devices) != 2:
+      raise errors.BlockDeviceError("We need two children in RemoveChildren")
+    for child, dev in zip(self._children, devices):
+      if dev != child.dev_path:
+        raise errors.BlockDeviceError("Mismatch in local storage"
+                                      " (%s != %s) in RemoveChildren" %
+                                      (dev, child.dev_path))
+
+    if not self._ShutdownLocal(self.minor):
+      raise errors.BlockDeviceError("Can't detach from local storage")
+    self._children = []

 
   @classmethod
 
   @classmethod

-  def _AssembleLocal(cls, minor, backend, meta):
-    """Configure the local part of a DRBD device.
+  def _SetMinorSyncSpeed(cls, minor, kbytes):
+    """Set the speed of the DRBD syncer.

 
 

-    This is the first thing that must be done on an unconfigured DRBD
-    device. And it must be done only once.
+    This is the low-level implementation.
+
+    @type minor: int
+    @param minor: the drbd minor whose settings we change
+    @type kbytes: int
+    @param kbytes: the speed in kbytes/second
+    @rtype: boolean
+    @return: the success of the operation

 
     """
 
     """

-    if not cls._IsValidMeta(meta):
-      return False
-    result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "disk",
-                           backend, meta, "0", "-e", "detach"])
+    result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "syncer",
+                           "-r", "%d" % kbytes, "--create-device"])

     if result.failed:
     if result.failed:

-      logger.Error("Can't attach local disk: %s" % result.output)
+      logging.error("Can't change syncer rate: %s - %s",
+                    result.fail_reason, result.output)

     return not result.failed
 
     return not result.failed
 

+  def SetSyncSpeed(self, kbytes):
+    """Set the speed of the DRBD syncer.

 
 

-  @classmethod
-  def _ShutdownLocal(cls, minor):
-    """Detach from the local device.
+    @type kbytes: int
+    @param kbytes: the speed in kbytes/second
+    @rtype: boolean
+    @return: the success of the operation

 
 

-    I/Os will continue to be served from the remote device. If we
-    don't have a remote device, this operation will fail.
+    """
+    if self.minor is None:
+      logging.info("Not attached during SetSyncSpeed")
+      return False
+    children_result = super(DRBD8, self).SetSyncSpeed(kbytes)
+    return self._SetMinorSyncSpeed(self.minor, kbytes) and children_result
+
+  def GetProcStatus(self):
+    """Return device data from /proc.

 
     """
 
     """

-    result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "detach"])
-    if result.failed:
-      logger.Error("Can't detach local device: %s" % result.output)
-    return not result.failed
+    if self.minor is None:
+      raise errors.BlockDeviceError("GetStats() called while not attached")
+    proc_info = self._MassageProcData(self._GetProcData())
+    if self.minor not in proc_info:
+      raise errors.BlockDeviceError("Can't find myself in /proc (minor %d)" %
+                                    self.minor)
+    return DRBD8Status(proc_info[self.minor])

 
 

+  def GetSyncStatus(self):
+    """Returns the sync status of the device.

 
 

-  @staticmethod
-  def _ShutdownAll(minor):
-    """Deactivate the device.
+
+    If sync_percent is None, it means all is ok
+    If estimated_time is None, it means we can't esimate
+    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
+    disk or not.
+
+    @rtype: tuple
+    @return: (sync_percent, estimated_time, is_degraded, ldisk)
+
+    """
+    if self.minor is None and not self.Attach():
+      raise errors.BlockDeviceError("Can't attach to device in GetSyncStatus")
+    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
+
+  def Open(self, force=False):
+    """Make the local state primary.
+
+    If the 'force' parameter is given, the '-o' option is passed to
+    drbdsetup. Since this is a potentially dangerous operation, the
+    force flag should be only given after creation, when it actually
+    is mandatory.
+
+    """
+    if self.minor is None and not self.Attach():
+      logging.error("DRBD cannot attach to a device during open")
+      return False
+    cmd = ["drbdsetup", self.dev_path, "primary"]
+    if force:
+      cmd.append("-o")
+    result = utils.RunCmd(cmd)
+    if result.failed:
+      msg = ("Can't make drbd device primary: %s" % result.output)
+      logging.error(msg)
+      raise errors.BlockDeviceError(msg)
+
+  def Close(self):
+    """Make the local state secondary.

 
     This will, of course, fail if the device is in use.
 
     """
 
     This will, of course, fail if the device is in use.
 
     """

-    result = utils.RunCmd(["drbdsetup", DRBDev._DevPath(minor), "down"])
+    if self.minor is None and not self.Attach():
+      logging.info("Instance not attached to a device")
+      raise errors.BlockDeviceError("Can't find device")
+    result = utils.RunCmd(["drbdsetup", self.dev_path, "secondary"])

     if result.failed:
     if result.failed:

-      logger.Error("Can't shutdown drbd device: %s" % result.output)
-    return not result.failed
+      msg = ("Can't switch drbd device to"
+             " secondary: %s" % result.output)
+      logging.error(msg)
+      raise errors.BlockDeviceError(msg)

 
 

+  def DisconnectNet(self):
+    """Removes network configuration.

 
 

-  @classmethod
-  def _AssembleNet(cls, minor, net_info, protocol):
-    """Configure the network part of the device.
+    This method shutdowns the network side of the device.

 
 

-    This operation can be, in theory, done multiple times, but there
-    have been cases (in lab testing) in which the network part of the
-    device had become stuck and couldn't be shut down because activity
-    from the new peer (also stuck) triggered a timer re-init and
-    needed remote peer interface shutdown in order to clear. So please
-    don't change online the net config.
+    The method will wait up to a hardcoded timeout for the device to
+    go into standalone after the 'disconnect' command before
+    re-configuring it, as sometimes it takes a while for the
+    disconnect to actually propagate and thus we might issue a 'net'
+    command while the device is still connected. If the device will
+    still be attached to the network and we time out, we raise an
+    exception.

 
     """
 
     """

-    lhost, lport, rhost, rport = net_info
-    result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "net",
-                           "%s:%s" % (lhost, lport), "%s:%s" % (rhost, rport),
-                           protocol])
-    if result.failed:
-      logger.Error("Can't setup network for dbrd device: %s" %
-                   result.fail_reason)
-      return False
+    if self.minor is None:
+      raise errors.BlockDeviceError("DRBD disk not attached in re-attach net")
+
+    if None in (self._lhost, self._lport, self._rhost, self._rport):
+      raise errors.BlockDeviceError("DRBD disk missing network info in"
+                                    " DisconnectNet()")
+
+    ever_disconnected = self._ShutdownNet(self.minor)
+    timeout_limit = time.time() + self._NET_RECONFIG_TIMEOUT
+    sleep_time = 0.100 # we start the retry time at 100 miliseconds
+    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
+      ever_disconnected = self._ShutdownNet(self.minor) or ever_disconnected
+      time.sleep(sleep_time)
+      sleep_time = min(2, sleep_time * 1.5)
+
+    if not status.is_standalone:
+      if ever_disconnected:
+        msg = ("Device did not react to the"
+               " 'disconnect' command in a timely manner")
+      else:
+        msg = ("Can't shutdown network, even after multiple retries")
+      raise errors.BlockDeviceError(msg)

 
 

-    timeout = time.time() + 10
-    ok = False
-    while time.time() < timeout:
-      info = cls._GetDevInfo(minor)
-      if not "local_addr" in info or not "remote_addr" in info:
-        time.sleep(1)
-        continue
-      if (info["local_addr"] != (lhost, lport) or
-          info["remote_addr"] != (rhost, rport)):
-        time.sleep(1)
-        continue
-      ok = True
-      break
-    if not ok:
-      logger.Error("Timeout while configuring network")
-      return False
-    return True
+    reconfig_time = time.time() - timeout_limit + self._NET_RECONFIG_TIMEOUT
+    if reconfig_time > 15: # hardcoded alert limit
+      logging.debug("DRBD8.DisconnectNet: detach took %.3f seconds",
+                    reconfig_time)

 
 

+  def AttachNet(self, multimaster):
+    """Reconnects the network.

 
 

-  @classmethod
-  def _ShutdownNet(cls, minor):
-    """Disconnect from the remote peer.
+    This method connects the network side of the device with a
+    specified multi-master flag. The device needs to be 'Standalone'
+    but have valid network configuration data.

 
 

-    This fails if we don't have a local device.
+    Args:
+      - multimaster: init the network in dual-primary mode

 
     """
 
     """

-    result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "disconnect"])
-    logger.Error("Can't shutdown network: %s" % result.output)
-    return not result.failed
+    if self.minor is None:
+      raise errors.BlockDeviceError("DRBD disk not attached in AttachNet")

 
 

+    if None in (self._lhost, self._lport, self._rhost, self._rport):
+      raise errors.BlockDeviceError("DRBD disk missing network info in"
+                                    " AttachNet()")

 
 

-  def _SetFromMinor(self, minor):
-    """Set our parameters based on the given minor.
+    status = self.GetProcStatus()

 
 

-    This sets our minor variable and our dev_path.
+    if not status.is_standalone:
+      raise errors.BlockDeviceError("Device is not standalone in AttachNet")
+
+    return self._AssembleNet(self.minor,
+                             (self._lhost, self._lport,
+                              self._rhost, self._rport),
+                             "C", dual_pri=multimaster)
+
+  def Attach(self):
+    """Check if our minor is configured.
+
+    This doesn't do any device configurations - it only checks if the
+    minor is in a state different from Unconfigured.
+
+    Note that this function will not change the state of the system in
+    any way (except in case of side-effects caused by reading from
+    /proc).

 
     """
 
     """

-    if minor is None:
-      self.minor = self.dev_path = None
+    used_devs = self.GetUsedDevs()
+    if self._aminor in used_devs:
+      minor = self._aminor

     else:
     else:

-      self.minor = minor
-      self.dev_path = self._DevPath(minor)
+      minor = None

 
 

+    self._SetFromMinor(minor)
+    return minor is not None

 
   def Assemble(self):
     """Assemble the drbd.
 
     Method:
 
   def Assemble(self):
     """Assemble the drbd.
 
     Method:

-      - if we have a local backing device, we bind to it by:
-        - checking the list of used drbd devices
-        - check if the local minor use of any of them is our own device
-        - if yes, abort?
-        - if not, bind
-      - if we have a local/remote net info:
-        - redo the local backing device step for the remote device
-        - check if any drbd device is using the local port,
-          if yes abort
-        - check if any remote drbd device is using the remote
-          port, if yes abort (for now)
-        - bind our net port
-        - bind the remote net port
+      - if we have a configured device, we try to ensure that it matches
+        our config
+      - if not, we create it from zero

 
     """
 
     """

-    self.Attach()
-    if self.minor is not None:
-      logger.Info("Already assembled")
-      return True
-
-    result = super(DRBDev, self).Assemble()
+    result = super(DRBD8, self).Assemble()

     if not result:
       return result
 
     if not result:
       return result
 

-    minor = self._FindUnusedMinor()
-    if minor is None:
-      raise errors.BlockDeviceError, "Not enough free minors for DRBD!"
+    self.Attach()
+    if self.minor is None:
+      # local device completely unconfigured
+      return self._FastAssemble()
+    else:
+      # we have to recheck the local and network status and try to fix
+      # the device
+      return self._SlowAssemble()
+
+  def _SlowAssemble(self):
+    """Assembles the DRBD device from a (partially) configured device.
+
+    In case of partially attached (local device matches but no network
+    setup), we perform the network attach. If successful, we re-test
+    the attach if can return success.
+
+    """
+    for minor in (self._aminor,):
+      info = self._GetDevInfo(self._GetShowData(minor))
+      match_l = self._MatchesLocal(info)
+      match_r = self._MatchesNet(info)
+      if match_l and match_r:
+        break
+      if match_l and not match_r and "local_addr" not in info:
+        res_r = self._AssembleNet(minor,
+                                  (self._lhost, self._lport,
+                                   self._rhost, self._rport),
+                                  constants.DRBD_NET_PROTOCOL,
+                                  hmac=constants.DRBD_HMAC_ALG,
+                                  secret=self._secret
+                                  )
+        if res_r:
+          if self._MatchesNet(self._GetDevInfo(self._GetShowData(minor))):
+            break
+      # the weakest case: we find something that is only net attached
+      # even though we were passed some children at init time
+      if match_r and "local_dev" not in info:
+        break
+
+      # this case must be considered only if we actually have local
+      # storage, i.e. not in diskless mode, because all diskless
+      # devices are equal from the point of view of local
+      # configuration
+      if (match_l and "local_dev" in info and
+          not match_r and "local_addr" in info):
+        # strange case - the device network part points to somewhere
+        # else, even though its local storage is ours; as we own the
+        # drbd space, we try to disconnect from the remote peer and
+        # reconnect to our correct one
+        if not self._ShutdownNet(minor):
+          raise errors.BlockDeviceError("Device has correct local storage,"
+                                        " wrong remote peer and is unable to"
+                                        " disconnect in order to attach to"
+                                        " the correct peer")
+        # 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)
+        if (self._AssembleNet(minor, (self._lhost, self._lport,
+                                      self._rhost, self._rport),
+                              constants.DRBD_NET_PROTOCOL,
+                              hmac=constants.DRBD_HMAC_ALG,
+                              secret=self._secret) and
+            self._MatchesNet(self._GetDevInfo(self._GetShowData(minor)))):
+          break
+
+    else:
+      minor = None
+
+    self._SetFromMinor(minor)
+    return minor is not None
+
+  def _FastAssemble(self):
+    """Assemble the drbd device from zero.
+
+    This is run when in Assemble we detect our minor is unused.
+
+    """
+    # TODO: maybe completely tear-down the minor (drbdsetup ... down)
+    # before attaching our own?
+    minor = self._aminor

     need_localdev_teardown = False
     need_localdev_teardown = False

-    if self._children[0]:
+    if self._children and self._children[0] and self._children[1]:

       result = self._AssembleLocal(minor, self._children[0].dev_path,
                                    self._children[1].dev_path)
       if not result:
       result = self._AssembleLocal(minor, self._children[0].dev_path,
                                    self._children[1].dev_path)
       if not result:

@@ -1201,255 +1434,234 @@ class DRBDev(BlockDev):
       result = self._AssembleNet(minor,
                                  (self._lhost, self._lport,
                                   self._rhost, self._rport),
       result = self._AssembleNet(minor,
                                  (self._lhost, self._lport,
                                   self._rhost, self._rport),

-                                 "C")
+                                 constants.DRBD_NET_PROTOCOL,
+                                 hmac=constants.DRBD_HMAC_ALG,
+                                 secret=self._secret)

       if not result:
         if need_localdev_teardown:
           # we will ignore failures from this
       if not result:
         if need_localdev_teardown:
           # we will ignore failures from this

-          logger.Error("net setup failed, tearing down local device")
+          logging.error("net setup failed, tearing down local device")

           self._ShutdownAll(minor)
         return False
     self._SetFromMinor(minor)
     return True
 
           self._ShutdownAll(minor)
         return False
     self._SetFromMinor(minor)
     return True
 

+  @classmethod
+  def _ShutdownLocal(cls, minor):
+    """Detach from the local device.

 
 

-  def Shutdown(self):
-    """Shutdown the DRBD device.
+    I/Os will continue to be served from the remote device. If we
+    don't have a remote device, this operation will fail.

 
     """
 
     """

-    if self.minor is None and not self.Attach():
-      logger.Info("DRBD device not attached to a device during Shutdown")
-      return True
-    if not self._ShutdownAll(self.minor):
-      return False
-    self.minor = None
-    self.dev_path = None
-    return True
-
+    result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "detach"])
+    if result.failed:
+      logging.error("Can't detach local device: %s", result.output)
+    return not result.failed

 
 

-  def Attach(self):
-    """Find a DRBD device which matches our config and attach to it.
+  @classmethod
+  def _ShutdownNet(cls, minor):
+    """Disconnect from the remote peer.

 
 

-    In case of partially attached (local device matches but no network
-    setup), we perform the network attach. If successful, we re-test
-    the attach if can return success.
+    This fails if we don't have a local device.

 
     """
 
     """

-    for minor in self._GetUsedDevs():
-      info = self._GetDevInfo(minor)
-      match_l = self._MatchesLocal(info)
-      match_r = self._MatchesNet(info)
-      if match_l and match_r:
-        break
-      if match_l and not match_r and "local_addr" not in info:
-        res_r = self._AssembleNet(minor,
-                                  (self._lhost, self._lport,
-                                   self._rhost, self._rport),
-                                  "C")
-        if res_r and self._MatchesNet(self._GetDevInfo(minor)):
-          break
-    else:
-      minor = None
+    result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "disconnect"])
+    if result.failed:
+      logging.error("Can't shutdown network: %s", result.output)
+    return not result.failed

 
 

-    self._SetFromMinor(minor)
-    return minor is not None
+  @classmethod
+  def _ShutdownAll(cls, minor):
+    """Deactivate the device.

 
 

+    This will, of course, fail if the device is in use.

 
 

-  def Open(self, force=False):
-    """Make the local state primary.
+    """
+    result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "down"])
+    if result.failed:
+      logging.error("Can't shutdown drbd device: %s", result.output)
+    return not result.failed

 
 

-    If the 'force' parameter is given, the '--do-what-I-say' parameter
-    is given. Since this is a pottentialy dangerous operation, the
-    force flag should be only given after creation, when it actually
-    has to be given.
+  def Shutdown(self):
+    """Shutdown the DRBD device.

 
     """
     if self.minor is None and not self.Attach():
 
     """
     if self.minor is None and not self.Attach():

-      logger.Error("DRBD cannot attach to a device during open")
-      return False
-    cmd = ["drbdsetup", self.dev_path, "primary"]
-    if force:
-      cmd.append("--do-what-I-say")
-    result = utils.RunCmd(cmd)
-    if result.failed:
-      logger.Error("Can't make drbd device primary: %s" % result.output)
+      logging.info("DRBD device not attached to a device during Shutdown")
+      return True
+    if not self._ShutdownAll(self.minor):

       return False
       return False

+    self.minor = None
+    self.dev_path = None

     return True
 
     return True
 

+  def Remove(self):
+    """Stub remove for DRBD devices.

 
 

-  def Close(self):
-    """Make the local state secondary.
+    """
+    return self.Shutdown()

 
 

-    This will, of course, fail if the device is in use.
+  @classmethod
+  def Create(cls, unique_id, children, size):
+    """Create a new DRBD8 device.

 
 

-    """
-    if self.minor is None and not self.Attach():
-      logger.Info("Instance not attached to a device")
-      raise errors.BlockDeviceError("Can't find device")
-    result = utils.RunCmd(["drbdsetup", self.dev_path, "secondary"])
-    if result.failed:
-      logger.Error("Can't switch drbd device to secondary: %s" % result.output)
-      raise errors.BlockDeviceError("Can't switch drbd device to secondary")
+    Since DRBD devices are not created per se, just assembled, this
+    function only initializes the metadata.

 
 

+    """
+    if len(children) != 2:
+      raise errors.ProgrammerError("Invalid setup for the drbd device")
+    # check that the minor is unused
+    aminor = unique_id[4]
+    proc_info = cls._MassageProcData(cls._GetProcData())
+    if aminor in proc_info:
+      status = DRBD8Status(proc_info[aminor])
+      in_use = status.is_in_use
+    else:
+      in_use = False
+    if in_use:
+      raise errors.BlockDeviceError("DRBD minor %d 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")
+    if not cls._CheckMetaSize(meta.dev_path):
+      raise errors.BlockDeviceError("Invalid meta device size")
+    cls._InitMeta(aminor, meta.dev_path)
+    return cls(unique_id, children)

 
 

-  def SetSyncSpeed(self, kbytes):
-    """Set the speed of the DRBD syncer.
+  def Grow(self, amount):
+    """Resize the DRBD device and its backing storage.

 
     """
 
     """

-    children_result = super(DRBDev, self).SetSyncSpeed(kbytes)

     if self.minor is None:
     if self.minor is None:

-      logger.Info("Instance not attached to a device")
-      return False
-    result = utils.RunCmd(["drbdsetup", self.dev_path, "syncer", "-r", "%d" %
-                           kbytes])
+      raise errors.ProgrammerError("drbd8: Grow called while not attached")
+    if len(self._children) != 2 or None in self._children:
+      raise errors.BlockDeviceError("Cannot grow diskless DRBD8 device")
+    self._children[0].Grow(amount)
+    result = utils.RunCmd(["drbdsetup", self.dev_path, "resize"])

     if result.failed:
     if result.failed:

-      logger.Error("Can't change syncer rate: %s " % result.fail_reason)
-    return not result.failed and children_result
+      raise errors.BlockDeviceError("resize failed for %s: %s" %
+                                    (self.dev_path, result.output))
+    return

 
 
 
 

-  def GetSyncStatus(self):
-    """Returns the sync status of the device.
+class FileStorage(BlockDev):
+  """File device.

 
 

-    Returns:
-     (sync_percent, estimated_time)
+  This class represents the a file storage backend device.

 
 

-    If sync_percent is None, it means all is ok
-    If estimated_time is None, it means we can't esimate
-    the time needed, otherwise it's the time left in seconds
+  The unique_id for the file device is a (file_driver, file_path) tuple.

 
 

-    """
-    if self.minor is None and not self.Attach():
-      raise errors.BlockDeviceError("Can't attach to device in GetSyncStatus")
-    proc_info = self._MassageProcData(self._GetProcData())
-    if self.minor not in proc_info:
-      raise errors.BlockDeviceError("Can't find myself in /proc (minor %d)" %
-                                    self.minor)
-    line = proc_info[self.minor]
-    match = re.match("^.*sync'ed: *([0-9.]+)%.*"
-                     " finish: ([0-9]+):([0-9]+):([0-9]+) .*$", line)
-    if match:
-      sync_percent = float(match.group(1))
-      hours = int(match.group(2))
-      minutes = int(match.group(3))
-      seconds = int(match.group(4))
-      est_time = hours * 3600 + minutes * 60 + seconds
-    else:
-      sync_percent = None
-      est_time = None
-    match = re.match("^ *[0-9]+: cs:([^ ]+).*$", line)
-    if not match:
-      raise errors.BlockDeviceError("Can't find my data in /proc (minor %d)" %
-                                    self.minor)
-    client_state = match.group(1)
-    is_degraded = client_state != "Connected"
-    return sync_percent, est_time, is_degraded
+  """
+  def __init__(self, unique_id, children):
+    """Initalizes a file device backend.

 
 

+    """
+    if children:
+      raise errors.BlockDeviceError("Invalid setup for file device")
+    super(FileStorage, self).__init__(unique_id, children)
+    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]
+    self.dev_path = unique_id[1]
+    self.Attach()

 
 

-  @staticmethod
-  def _MassageProcData(data):
-    """Transform the output of _GetProdData into a nicer form.
+  def Assemble(self):
+    """Assemble the device.

 
 

-    Returns:
-      a dictionary of minor: joined lines from /proc/drbd for that minor
+    Checks whether the file device exists, raises BlockDeviceError otherwise.

 
     """
 
     """

-    lmatch = re.compile("^ *([0-9]+):.*$")
-    results = {}
-    old_minor = old_line = None
-    for line in data:
-      lresult = lmatch.match(line)
-      if lresult is not None:
-        if old_minor is not None:
-          results[old_minor] = old_line
-        old_minor = int(lresult.group(1))
-        old_line = line
-      else:
-        if old_minor is not None:
-          old_line += " " + line.strip()
-    # add last line
-    if old_minor is not None:
-      results[old_minor] = old_line
-    return results
-
+    if not os.path.exists(self.dev_path):
+      raise errors.BlockDeviceError("File device '%s' does not exist." %
+                                    self.dev_path)
+    return True

 
 

-  def GetStatus(self):
-    """Compute the status of the DRBD device
+  def Shutdown(self):
+    """Shutdown the device.

 
 

-    Note that DRBD devices don't have the STATUS_EXISTING state.
+    This is a no-op for the file type, as we don't deacivate
+    the file on shutdown.

 
     """
 
     """

-    if self.minor is None and not self.Attach():
-      return self.STATUS_UNKNOWN
+    return True

 
 

-    data = self._GetProcData()
-    match = re.compile("^ *%d: cs:[^ ]+ st:(Primary|Secondary)/.*$" %
-                       self.minor)
-    for line in data:
-      mresult = match.match(line)
-      if mresult:
-        break
-    else:
-      logger.Error("Can't find myself!")
-      return self.STATUS_UNKNOWN
+  def Open(self, force=False):
+    """Make the device ready for I/O.

 
 

-    state = mresult.group(2)
-    if state == "Primary":
-      result = self.STATUS_ONLINE
-    else:
-      result = self.STATUS_STANDBY
+    This is a no-op for the file type.

 
 

-    return result
+    """
+    pass

 
 

+  def Close(self):
+    """Notifies that the device will no longer be used for I/O.

 
 

-  @staticmethod
-  def _ZeroDevice(device):
-    """Zero a device.
+    This is a no-op for the file type.
+
+    """
+    pass
+
+  def Remove(self):
+    """Remove the file backing the block device.

 
 

-    This writes until we get ENOSPC.
+    @rtype: boolean
+    @return: True if the removal was successful

 
     """
 
     """

-    f = open(device, "w")
-    buf = "\0" * 1048576
+    if not os.path.exists(self.dev_path):
+      return True

     try:
     try:

-      while True:
-        f.write(buf)
-    except IOError, err:
-      if err.errno != errno.ENOSPC:
-        raise
+      os.remove(self.dev_path)
+      return True
+    except OSError, err:
+      logging.error("Can't remove file '%s': %s", self.dev_path, err)
+      return False

 
 

+  def Attach(self):
+    """Attach to an existing file.

 
 

-  @classmethod
-  def Create(cls, unique_id, children, size):
-    """Create a new DRBD device.
+    Check if this file already exists.

 
 

-    Since DRBD devices are not created per se, just assembled, this
-    function just zeroes the meta device.
+    @rtype: boolean
+    @return: True if file exists

 
     """
 
     """

-    if len(children) != 2:
-      raise errors.ProgrammerError("Invalid setup for the drbd device")
-    meta = children[1]
-    meta.Assemble()
-    if not meta.Attach():
-      raise errors.BlockDeviceError("Can't attach to meta device")
-    if not cls._IsValidMeta(meta.dev_path):
-      raise errors.BlockDeviceError("Invalid meta device")
-    logger.Info("Started zeroing device %s" % meta.dev_path)
-    cls._ZeroDevice(meta.dev_path)
-    logger.Info("Done zeroing device %s" % meta.dev_path)
-    return cls(unique_id, children)
+    self.attached = os.path.exists(self.dev_path)
+    return self.attached

 
 

+  @classmethod
+  def Create(cls, unique_id, children, size):
+    """Create a new file.

 
 

-  def Remove(self):
-    """Stub remove for DRBD devices.
+    @param size: the size of file in MiB
+
+    @rtype: L{bdev.FileStorage}
+    @return: an instance of FileStorage

 
     """
 
     """

-    return self.Shutdown()
+    # 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]
+    try:
+      f = open(dev_path, 'w')
+      f.truncate(size * 1024 * 1024)
+      f.close()
+    except IOError, err:
+      raise errors.BlockDeviceError("Error in file creation: %" % str(err))
+
+    return FileStorage(unique_id, children)

 
 
 DEV_MAP = {
 
 
 DEV_MAP = {

-  "lvm": LogicalVolume,
-  "md_raid1": MDRaid1,
-  "drbd": DRBDev,
+  constants.LD_LV: LogicalVolume,
+  constants.LD_DRBD8: DRBD8,
+  constants.LD_FILE: FileStorage,

   }
 
 
   }
 
 

@@ -1463,24 +1675,22 @@ 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)
   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)

-  if not device.Attach():
+  if not device.attached:

     return None
     return None

-  return  device
+  return device

 
 
 
 

-def AttachOrAssemble(dev_type, unique_id, children):
+def Assemble(dev_type, unique_id, children):

   """Try to attach or assemble an existing device.
 
   """Try to attach or assemble an existing device.
 

-  This will attach to an existing assembled device or will assemble
-  the device, as needed, to bring it fully up.
+  This will attach to assemble the device, as needed, to bring it
+  fully up. It must be safe to run on already-assembled devices.

 
   """
   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)
 
   """
   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)

-  if not device.Attach():
-    device.Assemble()
-  if not device.Attach():
+  if not device.Assemble():

     raise errors.BlockDeviceError("Can't find a valid block device for"
                                   " %s/%s/%s" %
                                   (dev_type, unique_id, children))
     raise errors.BlockDeviceError("Can't find a valid block device for"
                                   " %s/%s/%s" %
                                   (dev_type, unique_id, children))