Get rid of constants.RAPI_ENABLE

[ganeti-local] / lib / bdev.py

diff --git a/lib/bdev.py b/lib/bdev.py
index 8fa718d..9ac41e5 100644 (file)
--- a/lib/bdev.py
+++ b/lib/bdev.py
@@ -108,13 +108,14 @@ class BlockDev(object):
   after assembly we'll have our correct major/minor.
 
   """
   after assembly we'll have our correct major/minor.
 
   """

-  def __init__(self, unique_id, children):
+  def __init__(self, unique_id, children, size):

     self._children = children
     self.dev_path = None
     self.unique_id = unique_id
     self.major = None
     self.minor = None
     self.attached = False
     self._children = children
     self.dev_path = None
     self.unique_id = unique_id
     self.major = None
     self.minor = None
     self.attached = False

+    self.size = size

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

@@ -128,7 +129,7 @@ class BlockDev(object):
         this method is idempotent
 
     """
         this method is idempotent
 
     """

-    return True
+    pass

 
   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.

@@ -160,7 +161,7 @@ class BlockDev(object):
     """Remove this device.
 
     This makes sense only for some of the device types: LV and file
     """Remove this device.
 
     This makes sense only for some of the device types: LV and file

-    storeage. Also note that if the device can't attach, the removal
+    storage. Also note that if the device can't attach, the removal

     can't be completed.
 
     """
     can't be completed.
 
     """

@@ -286,19 +287,19 @@ class LogicalVolume(BlockDev):
   """Logical Volume block device.
 
   """
   """Logical Volume block device.
 
   """

-  def __init__(self, unique_id, children):
+  def __init__(self, unique_id, children, size):

     """Attaches to a LV device.
 
     The unique_id is a tuple (vg_name, lv_name)
 
     """
     """Attaches to a LV device.
 
     The unique_id is a tuple (vg_name, lv_name)
 
     """

-    super(LogicalVolume, self).__init__(unique_id, children)
+    super(LogicalVolume, self).__init__(unique_id, children, size)

     if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 2:
       raise ValueError("Invalid configuration data %s" % str(unique_id))
     self._vg_name, self._lv_name = unique_id
     self.dev_path = "/dev/%s/%s" % (self._vg_name, self._lv_name)
     self._degraded = True
     if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 2:
       raise ValueError("Invalid configuration data %s" % str(unique_id))
     self._vg_name, self._lv_name = unique_id
     self.dev_path = "/dev/%s/%s" % (self._vg_name, self._lv_name)
     self._degraded = True

-    self.major = self.minor = None
+    self.major = self.minor = self.pe_size = self.stripe_count = None

     self.Attach()
 
   @classmethod
     self.Attach()
 
   @classmethod

@@ -318,18 +319,27 @@ class LogicalVolume(BlockDev):
 
     pvlist = [ pv[1] for pv in pvs_info ]
     free_size = sum([ pv[0] for pv in pvs_info ])
 
     pvlist = [ pv[1] for pv in pvs_info ]
     free_size = sum([ pv[0] for pv in pvs_info ])

+    current_pvs = len(pvlist)
+    stripes = min(current_pvs, constants.LVM_STRIPECOUNT)

 
     # The size constraint should have been checked from the master before
     # calling the create function.
     if free_size < size:
       _ThrowError("Not enough free space: required %s,"
                   " available %s", size, free_size)
 
     # The size constraint should have been checked from the master before
     # calling the create function.
     if free_size < size:
       _ThrowError("Not enough free space: required %s,"
                   " available %s", size, free_size)

-    result = utils.RunCmd(["lvcreate", "-L%dm" % size, "-n%s" % lv_name,
-                           vg_name] + pvlist)
+    cmd = ["lvcreate", "-L%dm" % size, "-n%s" % lv_name]
+    # If the free space is not well distributed, we won't be able to
+    # create an optimally-striped volume; in that case, we want to try
+    # with N, N-1, ..., 2, and finally 1 (non-stripped) number of
+    # stripes
+    for stripes_arg in range(stripes, 0, -1):
+      result = utils.RunCmd(cmd + ["-i%d" % stripes_arg] + [vg_name] + pvlist)
+      if not result.failed:
+        break

     if result.failed:
       _ThrowError("LV create failed (%s): %s",
                   result.fail_reason, result.output)
     if result.failed:
       _ThrowError("LV create failed (%s): %s",
                   result.fail_reason, result.output)

-    return LogicalVolume(unique_id, children)
+    return LogicalVolume(unique_id, children, size)

 
   @staticmethod
   def GetPVInfo(vg_name):
 
   @staticmethod
   def GetPVInfo(vg_name):

@@ -401,19 +411,30 @@ class LogicalVolume(BlockDev):
     """
     self.attached = False
     result = utils.RunCmd(["lvs", "--noheadings", "--separator=,",
     """
     self.attached = False
     result = utils.RunCmd(["lvs", "--noheadings", "--separator=,",

-                           "-olv_attr,lv_kernel_major,lv_kernel_minor",
-                           self.dev_path])
+                           "--units=m", "--nosuffix",
+                           "-olv_attr,lv_kernel_major,lv_kernel_minor,"
+                           "vg_extent_size,stripes", self.dev_path])

     if result.failed:
       logging.error("Can't find LV %s: %s, %s",
                     self.dev_path, result.fail_reason, result.output)
       return False
     if result.failed:
       logging.error("Can't find LV %s: %s, %s",
                     self.dev_path, result.fail_reason, result.output)
       return False

-    out = result.stdout.strip().rstrip(',')
+    # the output can (and will) have multiple lines for multi-segment
+    # LVs, as the 'stripes' parameter is a segment one, so we take
+    # only the last entry, which is the one we're interested in; note
+    # that with LVM2 anyway the 'stripes' value must be constant
+    # across segments, so this is a no-op actually
+    out = result.stdout.splitlines()
+    if not out: # totally empty result? splitlines() returns at least
+                # one line for any non-empty string
+      logging.error("Can't parse LVS output, no lines? Got '%s'", str(out))
+      return False
+    out = out[-1].strip().rstrip(',')

     out = out.split(",")
     out = out.split(",")

-    if len(out) != 3:
-      logging.error("Can't parse LVS output, len(%s) != 3", str(out))
+    if len(out) != 5:
+      logging.error("Can't parse LVS output, len(%s) != 5", str(out))

       return False
 
       return False
 

-    status, major, minor = out[:3]
+    status, major, minor, pe_size, stripes = out

     if len(status) != 6:
       logging.error("lvs lv_attr is not 6 characters (%s)", status)
       return False
     if len(status) != 6:
       logging.error("lvs lv_attr is not 6 characters (%s)", status)
       return False

@@ -424,8 +445,22 @@ class LogicalVolume(BlockDev):
     except ValueError, err:
       logging.error("lvs major/minor cannot be parsed: %s", str(err))
 
     except ValueError, err:
       logging.error("lvs major/minor cannot be parsed: %s", str(err))
 

+    try:
+      pe_size = int(float(pe_size))
+    except (TypeError, ValueError), err:
+      logging.error("Can't parse vg extent size: %s", err)
+      return False
+
+    try:
+      stripes = int(stripes)
+    except (TypeError, ValueError), err:
+      logging.error("Can't parse the number of stripes: %s", err)
+      return False
+

     self.major = major
     self.minor = minor
     self.major = major
     self.minor = minor

+    self.pe_size = pe_size
+    self.stripe_count = stripes

     self._degraded = status[0] == 'v' # virtual volume, i.e. doesn't backing
                                       # storage
     self.attached = True
     self._degraded = status[0] == 'v' # virtual volume, i.e. doesn't backing
                                       # storage
     self.attached = True

@@ -434,16 +469,14 @@ class LogicalVolume(BlockDev):
   def Assemble(self):
     """Assemble the device.
 
   def Assemble(self):
     """Assemble the device.
 

-    We alway run `lvchange -ay` on the LV to ensure it's active before
+    We always run `lvchange -ay` on the LV to ensure it's active before

     use, as there were cases when xenvg was not active after boot
     (also possibly after disk issues).
 
     """
     result = utils.RunCmd(["lvchange", "-ay", self.dev_path])
     if result.failed:
     use, as there were cases when xenvg was not active after boot
     (also possibly after disk issues).
 
     """
     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()
+      _ThrowError("Can't activate lv %s: %s", self.dev_path, result.output)

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

@@ -502,7 +535,7 @@ class LogicalVolume(BlockDev):
     snap_name = self._lv_name + ".snap"
 
     # remove existing snapshot if found
     snap_name = self._lv_name + ".snap"
 
     # remove existing snapshot if found

-    snap = LogicalVolume((self._vg_name, snap_name), None)
+    snap = LogicalVolume((self._vg_name, snap_name), None, size)

     _IgnoreError(snap.Remove)
 
     pvs_info = self.GetPVInfo(self._vg_name)
     _IgnoreError(snap.Remove)
 
     pvs_info = self.GetPVInfo(self._vg_name)

@@ -546,6 +579,13 @@ class LogicalVolume(BlockDev):
     """Grow the logical volume.
 
     """
     """Grow the logical volume.
 
     """

+    if self.pe_size is None or self.stripe_count is None:
+      if not self.Attach():
+        _ThrowError("Can't attach to LV during Grow()")
+    full_stripe_size = self.pe_size * self.stripe_count
+    rest = amount % full_stripe_size
+    if rest != 0:
+      amount += full_stripe_size - rest

     # we try multiple algorithms since the 'best' ones might not have
     # space available in the right place, but later ones might (since
     # they have less constraints); also note that only recent LVM
     # 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

@@ -565,15 +605,56 @@ class DRBD8Status(object):
 
   """
   UNCONF_RE = re.compile(r"\s*[0-9]+:\s*cs:Unconfigured$")
 
   """
   UNCONF_RE = re.compile(r"\s*[0-9]+:\s*cs:Unconfigured$")

-  LINE_RE = re.compile(r"\s*[0-9]+:\s*cs:(\S+)\s+st:([^/]+)/(\S+)"
+  LINE_RE = re.compile(r"\s*[0-9]+:\s*cs:(\S+)\s+(?:st|ro):([^/]+)/(\S+)"

                        "\s+ds:([^/]+)/(\S+)\s+.*$")
   SYNC_RE = re.compile(r"^.*\ssync'ed:\s*([0-9.]+)%.*"
                        "\sfinish: ([0-9]+):([0-9]+):([0-9]+)\s.*$")
 
                        "\s+ds:([^/]+)/(\S+)\s+.*$")
   SYNC_RE = re.compile(r"^.*\ssync'ed:\s*([0-9.]+)%.*"
                        "\sfinish: ([0-9]+):([0-9]+):([0-9]+)\s.*$")
 

+  CS_UNCONFIGURED = "Unconfigured"
+  CS_STANDALONE = "StandAlone"
+  CS_WFCONNECTION = "WFConnection"
+  CS_WFREPORTPARAMS = "WFReportParams"
+  CS_CONNECTED = "Connected"
+  CS_STARTINGSYNCS = "StartingSyncS"
+  CS_STARTINGSYNCT = "StartingSyncT"
+  CS_WFBITMAPS = "WFBitMapS"
+  CS_WFBITMAPT = "WFBitMapT"
+  CS_WFSYNCUUID = "WFSyncUUID"
+  CS_SYNCSOURCE = "SyncSource"
+  CS_SYNCTARGET = "SyncTarget"
+  CS_PAUSEDSYNCS = "PausedSyncS"
+  CS_PAUSEDSYNCT = "PausedSyncT"
+  CSET_SYNC = frozenset([
+    CS_WFREPORTPARAMS,
+    CS_STARTINGSYNCS,
+    CS_STARTINGSYNCT,
+    CS_WFBITMAPS,
+    CS_WFBITMAPT,
+    CS_WFSYNCUUID,
+    CS_SYNCSOURCE,
+    CS_SYNCTARGET,
+    CS_PAUSEDSYNCS,
+    CS_PAUSEDSYNCT,
+    ])
+
+  DS_DISKLESS = "Diskless"
+  DS_ATTACHING = "Attaching" # transient state
+  DS_FAILED = "Failed" # transient state, next: diskless
+  DS_NEGOTIATING = "Negotiating" # transient state
+  DS_INCONSISTENT = "Inconsistent" # while syncing or after creation
+  DS_OUTDATED = "Outdated"
+  DS_DUNKNOWN = "DUnknown" # shown for peer disk when not connected
+  DS_CONSISTENT = "Consistent"
+  DS_UPTODATE = "UpToDate" # normal state
+
+  RO_PRIMARY = "Primary"
+  RO_SECONDARY = "Secondary"
+  RO_UNKNOWN = "Unknown"
+

   def __init__(self, procline):
     u = self.UNCONF_RE.match(procline)
     if u:
   def __init__(self, procline):
     u = self.UNCONF_RE.match(procline)
     if u:

-      self.cstatus = "Unconfigured"
+      self.cstatus = self.CS_UNCONFIGURED

       self.lrole = self.rrole = self.ldisk = self.rdisk = None
     else:
       m = self.LINE_RE.match(procline)
       self.lrole = self.rrole = self.ldisk = self.rdisk = None
     else:
       m = self.LINE_RE.match(procline)

@@ -587,21 +668,21 @@ class DRBD8Status(object):
 
     # end reading of data from the LINE_RE or UNCONF_RE
 
 
     # end reading of data from the LINE_RE or UNCONF_RE
 

-    self.is_standalone = self.cstatus == "StandAlone"
-    self.is_wfconn = self.cstatus == "WFConnection"
-    self.is_connected = self.cstatus == "Connected"
-    self.is_primary = self.lrole == "Primary"
-    self.is_secondary = self.lrole == "Secondary"
-    self.peer_primary = self.rrole == "Primary"
-    self.peer_secondary = self.rrole == "Secondary"
+    self.is_standalone = self.cstatus == self.CS_STANDALONE
+    self.is_wfconn = self.cstatus == self.CS_WFCONNECTION
+    self.is_connected = self.cstatus == self.CS_CONNECTED
+    self.is_primary = self.lrole == self.RO_PRIMARY
+    self.is_secondary = self.lrole == self.RO_SECONDARY
+    self.peer_primary = self.rrole == self.RO_PRIMARY
+    self.peer_secondary = self.rrole == self.RO_SECONDARY

     self.both_primary = self.is_primary and self.peer_primary
     self.both_secondary = self.is_secondary and self.peer_secondary
 
     self.both_primary = self.is_primary and self.peer_primary
     self.both_secondary = self.is_secondary and self.peer_secondary
 

-    self.is_diskless = self.ldisk == "Diskless"
-    self.is_disk_uptodate = self.ldisk == "UpToDate"
+    self.is_diskless = self.ldisk == self.DS_DISKLESS
+    self.is_disk_uptodate = self.ldisk == self.DS_UPTODATE

 
 

-    self.is_in_resync = self.cstatus in ("SyncSource", "SyncTarget")
-    self.is_in_use = self.cstatus != "Unconfigured"
+    self.is_in_resync = self.cstatus in self.CSET_SYNC
+    self.is_in_use = self.cstatus != self.CS_UNCONFIGURED

 
     m = self.SYNC_RE.match(procline)
     if m:
 
     m = self.SYNC_RE.match(procline)
     if m:

@@ -611,13 +692,16 @@ class DRBD8Status(object):
       seconds = int(m.group(4))
       self.est_time = hours * 3600 + minutes * 60 + seconds
     else:
       seconds = int(m.group(4))
       self.est_time = hours * 3600 + minutes * 60 + seconds
     else:

-      self.sync_percent = None
+      # we have (in this if branch) no percent information, but if
+      # we're resyncing we need to 'fake' a sync percent information,
+      # as this is how cmdlib determines if it makes sense to wait for
+      # resyncing or not
+      if self.is_in_resync:
+        self.sync_percent = 0
+      else:
+        self.sync_percent = None

       self.est_time = None
 
       self.est_time = None
 

-    self.is_sync_target = self.peer_sync_source = self.cstatus == "SyncTarget"
-    self.peer_sync_target = self.is_sync_source = self.cstatus == "SyncSource"
-    self.is_resync = self.is_sync_target or self.is_sync_source
-

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

@@ -641,11 +725,18 @@ class BaseDRBD(BlockDev):
     """Return data from /proc/drbd.
 
     """
     """Return data from /proc/drbd.
 
     """

-    stat = open(filename, "r")

     try:
     try:

-      data = stat.read().splitlines()
-    finally:
-      stat.close()
+      stat = open(filename, "r")
+      try:
+        data = stat.read().splitlines()
+      finally:
+        stat.close()
+    except EnvironmentError, err:
+      if err.errno == errno.ENOENT:
+        _ThrowError("The file %s cannot be opened, check if the module"
+                    " is loaded (%s)", filename, str(err))
+      else:
+        _ThrowError("Can't read the DRBD proc file %s: %s", filename, str(err))

     if not data:
       _ThrowError("Can't read any data from %s", filename)
     return data
     if not data:
       _ThrowError("Can't read any data from %s", filename)
     return data

@@ -760,22 +851,23 @@ class BaseDRBD(BlockDev):
     """
     result = utils.RunCmd(["blockdev", "--getsize", meta_device])
     if result.failed:
     """
     result = utils.RunCmd(["blockdev", "--getsize", meta_device])
     if result.failed:

-      logging.error("Failed to get device size: %s - %s",
-                    result.fail_reason, result.output)
-      return False
+      _ThrowError("Failed to get device size: %s - %s",
+                  result.fail_reason, result.output)

     try:
       sectors = int(result.stdout)
     except ValueError:
     try:
       sectors = int(result.stdout)
     except ValueError:

-      logging.error("Invalid output from blockdev: '%s'", result.stdout)
-      return False
+      _ThrowError("Invalid output from blockdev: '%s'", result.stdout)

     bytes = sectors * 512
     if bytes < 128 * 1024 * 1024: # less than 128MiB
     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
+      _ThrowError("Meta device too small (%.2fMib)", (bytes / 1024 / 1024))
+    # the maximum *valid* size of the meta device when living on top
+    # of LVM is hard to compute: it depends on the number of stripes
+    # and the PE size; e.g. a 2-stripe, 64MB PE will result in a 128MB
+    # (normal size), but an eight-stripe 128MB PE will result in a 1GB
+    # size meta device; as such, we restrict it to 1GB (a little bit
+    # too generous, but making assumptions about PE size is hard)
+    if bytes > 1024 * 1024 * 1024:
+      _ThrowError("Meta device too big (%.2fMiB)", (bytes / 1024 / 1024))

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

@@ -805,10 +897,10 @@ class DRBD8(BaseDRBD):
   # timeout constants
   _NET_RECONFIG_TIMEOUT = 60
 
   # timeout constants
   _NET_RECONFIG_TIMEOUT = 60
 

-  def __init__(self, unique_id, children):
+  def __init__(self, unique_id, children, size):

     if children and children.count(None) > 0:
       children = []
     if children and children.count(None) > 0:
       children = []

-    super(DRBD8, self).__init__(unique_id, children)
+    super(DRBD8, self).__init__(unique_id, children, size)

     self.major = self._DRBD_MAJOR
     version = self._GetVersion()
     if version['k_major'] != 8 :
     self.major = self._DRBD_MAJOR
     version = self._GetVersion()
     if version['k_major'] != 8 :

@@ -896,15 +988,20 @@ class DRBD8(BaseDRBD):
     # value types
     value = pyp.Word(pyp.alphanums + '_-/.:')
     quoted = dbl_quote + pyp.CharsNotIn('"') + dbl_quote
     # value types
     value = pyp.Word(pyp.alphanums + '_-/.:')
     quoted = dbl_quote + pyp.CharsNotIn('"') + dbl_quote

-    addr_port = (pyp.Word(pyp.nums + '.') + pyp.Literal(':').suppress() +
-                 number)
+    addr_type = (pyp.Optional(pyp.Literal("ipv4")).suppress() +
+                 pyp.Optional(pyp.Literal("ipv6")).suppress())
+    addr_port = (addr_type + pyp.Word(pyp.nums + '.') +
+                 pyp.Literal(':').suppress() + number)

     # meta device, extended syntax
     meta_value = ((value ^ quoted) + pyp.Literal('[').suppress() +
                   number + pyp.Word(']').suppress())
     # meta device, extended syntax
     meta_value = ((value ^ quoted) + pyp.Literal('[').suppress() +
                   number + pyp.Word(']').suppress())

+    # device name, extended syntax
+    device_value = pyp.Literal("minor").suppress() + number

 
     # a statement
     stmt = (~rbrace + keyword + ~lbrace +
 
     # a statement
     stmt = (~rbrace + keyword + ~lbrace +

-            pyp.Optional(addr_port ^ value ^ quoted ^ meta_value) +
+            pyp.Optional(addr_port ^ value ^ quoted ^ meta_value ^
+                         device_value) +

             pyp.Optional(defa) + semi +
             pyp.Optional(pyp.restOfLine).suppress())
 
             pyp.Optional(defa) + semi +
             pyp.Optional(pyp.restOfLine).suppress())
 

@@ -1026,16 +1123,18 @@ class DRBD8(BaseDRBD):
     return retval
 
   @classmethod
     return retval
 
   @classmethod

-  def _AssembleLocal(cls, minor, backend, meta):
+  def _AssembleLocal(cls, minor, backend, meta, size):

     """Configure the local part of a DRBD device.
 
     """
     args = ["drbdsetup", cls._DevPath(minor), "disk",
     """Configure the local part of a DRBD device.
 
     """
     args = ["drbdsetup", cls._DevPath(minor), "disk",

-            backend, meta, "0", "-e", "detach", "--create-device"]
+            backend, meta, "0",
+            "-d", "%sm" % size,
+            "-e", "detach",
+            "--create-device"]

     result = utils.RunCmd(args)
     if result.failed:
     result = utils.RunCmd(args)
     if result.failed:

-      logging.error("Can't attach local disk: %s", result.output)
-    return not result.failed
+      _ThrowError("drbd%d: can't attach local disk: %s", minor, result.output)

 
   @classmethod
   def _AssembleNet(cls, minor, net_info, protocol,
 
   @classmethod
   def _AssembleNet(cls, minor, net_info, protocol,

@@ -1047,7 +1146,8 @@ class DRBD8(BaseDRBD):
     if None in net_info:
       # we don't want network connection and actually want to make
       # sure its shutdown
     if None in net_info:
       # we don't want network connection and actually want to make
       # sure its shutdown

-      return cls._ShutdownNet(minor)
+      cls._ShutdownNet(minor)
+      return

 
     # Workaround for a race condition. When DRBD is doing its dance to
     # establish a connection with its peer, it also sends the
 
     # Workaround for a race condition. When DRBD is doing its dance to
     # establish a connection with its peer, it also sends the

@@ -1069,9 +1169,8 @@ class DRBD8(BaseDRBD):
       args.extend(["-a", hmac, "-x", secret])
     result = utils.RunCmd(args)
     if result.failed:
       args.extend(["-a", hmac, "-x", secret])
     result = utils.RunCmd(args)
     if result.failed:

-      logging.error("Can't setup network for dbrd device: %s - %s",
-                    result.fail_reason, result.output)
-      return False
+      _ThrowError("drbd%d: can't setup network: %s - %s",
+                  minor, result.fail_reason, result.output)

 
     timeout = time.time() + 10
     ok = False
 
     timeout = time.time() + 10
     ok = False

@@ -1087,9 +1186,7 @@ class DRBD8(BaseDRBD):
       ok = True
       break
     if not ok:
       ok = True
       break
     if not ok:

-      logging.error("Timeout while configuring network")
-      return False
-    return True
+      _ThrowError("drbd%d: timeout while configuring network", minor)

 
   def AddChildren(self, devices):
     """Add a disk to the DRBD device.
 
   def AddChildren(self, devices):
     """Add a disk to the DRBD device.

@@ -1108,12 +1205,10 @@ class DRBD8(BaseDRBD):
       _ThrowError("drbd%d: children not ready during AddChildren", self.minor)
     backend.Open()
     meta.Open()
       _ThrowError("drbd%d: children not ready during AddChildren", self.minor)
     backend.Open()
     meta.Open()

-    if not self._CheckMetaSize(meta.dev_path):
-      raise errors.BlockDeviceError("Invalid meta device size")
+    self._CheckMetaSize(meta.dev_path)

     self._InitMeta(self._FindUnusedMinor(), meta.dev_path)
 
     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._AssembleLocal(self.minor, backend.dev_path, meta.dev_path, self.size)

     self._children = devices
 
   def RemoveChildren(self, devices):
     self._children = devices
 
   def RemoveChildren(self, devices):

@@ -1140,8 +1235,7 @@ class DRBD8(BaseDRBD):
         _ThrowError("drbd%d: mismatch in local storage (%s != %s) in"
                     " RemoveChildren", self.minor, dev, child.dev_path)
 
         _ThrowError("drbd%d: mismatch in local storage (%s != %s) in"
                     " RemoveChildren", self.minor, dev, child.dev_path)
 

-    if not self._ShutdownLocal(self.minor):
-      raise errors.BlockDeviceError("Can't detach from local storage")
+    self._ShutdownLocal(self.minor)

     self._children = []
 
   @classmethod
     self._children = []
 
   @classmethod

@@ -1196,14 +1290,14 @@ class DRBD8(BaseDRBD):
 
 
     If sync_percent is None, it means all is ok
 
 
     If sync_percent is None, it means all is ok

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

     the time needed, otherwise it's the time left in seconds.
 
 
     We set the is_degraded parameter to True on two conditions:
     network not connected or local disk missing.
 
     the time needed, otherwise it's the time left in seconds.
 
 
     We set the is_degraded parameter to True on two conditions:
     network not connected or local disk missing.
 

-    We compute the ldisk parameter based on wheter we have a local
+    We compute the ldisk parameter based on whether we have a local

     disk or not.
 
     @rtype: tuple
     disk or not.
 
     @rtype: tuple

@@ -1271,17 +1365,18 @@ class DRBD8(BaseDRBD):
       _ThrowError("drbd%d: DRBD disk missing network info in"
                   " DisconnectNet()", self.minor)
 
       _ThrowError("drbd%d: DRBD disk missing network info in"
                   " DisconnectNet()", self.minor)
 

-    ever_disconnected = self._ShutdownNet(self.minor)
+    ever_disconnected = _IgnoreError(self._ShutdownNet, self.minor)

     timeout_limit = time.time() + self._NET_RECONFIG_TIMEOUT
     timeout_limit = time.time() + self._NET_RECONFIG_TIMEOUT

-    sleep_time = 0.100 # we start the retry time at 100 miliseconds
+    sleep_time = 0.100 # we start the retry time at 100 milliseconds

     while time.time() < timeout_limit:
       status = self.GetProcStatus()
       if status.is_standalone:
         break
       # retry the disconnect, it seems possible that due to a
       # well-time disconnect on the peer, my disconnect command might
     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
+      # be ignored and forgotten
+      ever_disconnected = _IgnoreError(self._ShutdownNet, self.minor) or \
+                          ever_disconnected

       time.sleep(sleep_time)
       sleep_time = min(2, sleep_time * 1.5)
 
       time.sleep(sleep_time)
       sleep_time = min(2, sleep_time * 1.5)
 

@@ -1320,10 +1415,10 @@ class DRBD8(BaseDRBD):
     if not status.is_standalone:
       _ThrowError("drbd%d: device is not standalone in AttachNet", self.minor)
 
     if not status.is_standalone:
       _ThrowError("drbd%d: device is not standalone in AttachNet", self.minor)
 

-    return self._AssembleNet(self.minor,
-                             (self._lhost, self._lport,
-                              self._rhost, self._rport),
-                             "C", dual_pri=multimaster)
+    self._AssembleNet(self.minor,
+                      (self._lhost, self._lport, self._rhost, self._rport),
+                      constants.DRBD_NET_PROTOCOL, dual_pri=multimaster,
+                      hmac=constants.DRBD_HMAC_ALG, secret=self._secret)

 
   def Attach(self):
     """Check if our minor is configured.
 
   def Attach(self):
     """Check if our minor is configured.

@@ -1354,18 +1449,16 @@ class DRBD8(BaseDRBD):
       - if not, we create it from zero
 
     """
       - if not, we create it from zero
 
     """

-    result = super(DRBD8, self).Assemble()
-    if not result:
-      return result
+    super(DRBD8, self).Assemble()

 
     self.Attach()
     if self.minor is None:
       # local device completely unconfigured
 
     self.Attach()
     if self.minor is None:
       # local device completely unconfigured

-      return self._FastAssemble()
+      self._FastAssemble()

     else:
       # we have to recheck the local and network status and try to fix
       # the device
     else:
       # we have to recheck the local and network status and try to fix
       # the device

-      return self._SlowAssemble()
+      self._SlowAssemble()

 
   def _SlowAssemble(self):
     """Assembles the DRBD device from a (partially) configured device.
 
   def _SlowAssemble(self):
     """Assembles the DRBD device from a (partially) configured device.

@@ -1375,27 +1468,35 @@ class DRBD8(BaseDRBD):
     the attach if can return success.
 
     """
     the attach if can return success.
 
     """

+    net_data = (self._lhost, self._lport, self._rhost, self._rport)

     for minor in (self._aminor,):
       info = self._GetDevInfo(self._GetShowData(minor))
       match_l = self._MatchesLocal(info)
       match_r = self._MatchesNet(info)
     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:
       if match_l and match_r:

+        # everything matches

         break
         break

+

       if match_l and not match_r and "local_addr" not in info:
       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
+        # disk matches, but not attached to network, attach and recheck
+        self._AssembleNet(minor, net_data, constants.DRBD_NET_PROTOCOL,
+                          hmac=constants.DRBD_HMAC_ALG, secret=self._secret)
+        if self._MatchesNet(self._GetDevInfo(self._GetShowData(minor))):
+          break
+        else:
+          _ThrowError("drbd%d: network attach successful, but 'drbdsetup"
+                      " show' disagrees", minor)
+

       if match_r and "local_dev" not in info:
       if match_r and "local_dev" not in info:

-        break
+        # no local disk, but network attached and it matches
+        self._AssembleLocal(minor, self._children[0].dev_path,
+                            self._children[1].dev_path, self.size)
+        if self._MatchesNet(self._GetDevInfo(self._GetShowData(minor))):
+          break
+        else:
+          _ThrowError("drbd%d: disk attach successful, but 'drbdsetup"
+                      " show' disagrees", minor)

 
       # this case must be considered only if we actually have local
       # storage, i.e. not in diskless mode, because all diskless
 
       # this case must be considered only if we actually have local
       # storage, i.e. not in diskless mode, because all diskless

@@ -1407,27 +1508,30 @@ class DRBD8(BaseDRBD):
         # 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
         # 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")
+        try:
+          self._ShutdownNet(minor)
+        except errors.BlockDeviceError, err:
+          _ThrowError("drbd%d: device has correct local storage, wrong"
+                      " remote peer and is unable to disconnect in order"
+                      " to attach to the correct peer: %s", minor, str(err))

         # note: _AssembleNet also handles the case when we don't want
         # local storage (i.e. one or more of the _[lr](host|port) is
         # None)
         # 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)))):
+        self._AssembleNet(minor, net_data, constants.DRBD_NET_PROTOCOL,
+                          hmac=constants.DRBD_HMAC_ALG, secret=self._secret)
+        if self._MatchesNet(self._GetDevInfo(self._GetShowData(minor))):

           break
           break

+        else:
+          _ThrowError("drbd%d: network attach successful, but 'drbdsetup"
+                      " show' disagrees", minor)

 
     else:
       minor = None
 
     self._SetFromMinor(minor)
 
     else:
       minor = None
 
     self._SetFromMinor(minor)

-    return minor is not None
+    if minor is None:
+      _ThrowError("drbd%d: cannot activate, unknown or unhandled reason",
+                  self._aminor)

 
   def _FastAssemble(self):
     """Assemble the drbd device from zero.
 
   def _FastAssemble(self):
     """Assemble the drbd device from zero.

@@ -1435,26 +1539,16 @@ class DRBD8(BaseDRBD):
     This is run when in Assemble we detect our minor is unused.
 
     """
     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
     minor = self._aminor

-    need_localdev_teardown = False

     if self._children and self._children[0] and self._children[1]:
     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:
-        return False
+      self._AssembleLocal(minor, self._children[0].dev_path,
+                          self._children[1].dev_path, self.size)

     if self._lhost and self._lport and self._rhost and self._rport:
     if self._lhost and self._lport and self._rhost and self._rport:

-      result = self._AssembleNet(minor,
-                                 (self._lhost, self._lport,
-                                  self._rhost, self._rport),
-                                 constants.DRBD_NET_PROTOCOL,
-                                 hmac=constants.DRBD_HMAC_ALG,
-                                 secret=self._secret)
-      if not result:
-        return False
+      self._AssembleNet(minor,
+                        (self._lhost, self._lport, self._rhost, self._rport),
+                        constants.DRBD_NET_PROTOCOL,
+                        hmac=constants.DRBD_HMAC_ALG, secret=self._secret)

     self._SetFromMinor(minor)
     self._SetFromMinor(minor)

-    return True

 
   @classmethod
   def _ShutdownLocal(cls, minor):
 
   @classmethod
   def _ShutdownLocal(cls, minor):

@@ -1466,8 +1560,7 @@ class DRBD8(BaseDRBD):
     """
     result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "detach"])
     if result.failed:
     """
     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
+      _ThrowError("drbd%d: can't detach local disk: %s", minor, result.output)

 
   @classmethod
   def _ShutdownNet(cls, minor):
 
   @classmethod
   def _ShutdownNet(cls, minor):

@@ -1478,8 +1571,7 @@ class DRBD8(BaseDRBD):
     """
     result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "disconnect"])
     if result.failed:
     """
     result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "disconnect"])
     if result.failed:

-      logging.error("Can't shutdown network: %s", result.output)
-    return not result.failed
+      _ThrowError("drbd%d: can't shutdown network: %s", minor, result.output)

 
   @classmethod
   def _ShutdownAll(cls, minor):
 
   @classmethod
   def _ShutdownAll(cls, minor):

@@ -1490,7 +1582,8 @@ class DRBD8(BaseDRBD):
     """
     result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "down"])
     if result.failed:
     """
     result = utils.RunCmd(["drbdsetup", cls._DevPath(minor), "down"])
     if result.failed:

-      _ThrowError("Can't shutdown drbd device: %s", result.output)
+      _ThrowError("drbd%d: can't shutdown drbd device: %s",
+                  minor, result.output)

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

@@ -1529,15 +1622,15 @@ class DRBD8(BaseDRBD):
     else:
       in_use = False
     if in_use:
     else:
       in_use = False
     if in_use:

-      _ThrowError("DRBD minor %d already in use at Create() time", aminor)
+      _ThrowError("drbd%d: minor is already in use at Create() time", aminor)

     meta = children[1]
     meta.Assemble()
     if not meta.Attach():
     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")
+      _ThrowError("drbd%d: can't attach to meta device '%s'",
+                  aminor, meta)
+    cls._CheckMetaSize(meta.dev_path)

     cls._InitMeta(aminor, meta.dev_path)
     cls._InitMeta(aminor, meta.dev_path)

-    return cls(unique_id, children)
+    return cls(unique_id, children, size)

 
   def Grow(self, amount):
     """Resize the DRBD device and its backing storage.
 
   def Grow(self, amount):
     """Resize the DRBD device and its backing storage.

@@ -1548,7 +1641,8 @@ class DRBD8(BaseDRBD):
     if len(self._children) != 2 or None in self._children:
       _ThrowError("drbd%d: cannot grow diskless device", self.minor)
     self._children[0].Grow(amount)
     if len(self._children) != 2 or None in self._children:
       _ThrowError("drbd%d: cannot grow diskless device", self.minor)
     self._children[0].Grow(amount)

-    result = utils.RunCmd(["drbdsetup", self.dev_path, "resize"])
+    result = utils.RunCmd(["drbdsetup", self.dev_path, "resize", "-s",
+                           "%dm" % (self.size + amount)])

     if result.failed:
       _ThrowError("drbd%d: resize failed: %s", self.minor, result.output)
 
     if result.failed:
       _ThrowError("drbd%d: resize failed: %s", self.minor, result.output)
 

@@ -1561,13 +1655,13 @@ class FileStorage(BlockDev):
   The unique_id for the file device is a (file_driver, file_path) tuple.
 
   """
   The unique_id for the file device is a (file_driver, file_path) tuple.
 
   """

-  def __init__(self, unique_id, children):
+  def __init__(self, unique_id, children, size):

     """Initalizes a file device backend.
 
     """
     if children:
       raise errors.BlockDeviceError("Invalid setup for file device")
     """Initalizes a file device backend.
 
     """
     if children:
       raise errors.BlockDeviceError("Invalid setup for file device")

-    super(FileStorage, self).__init__(unique_id, children)
+    super(FileStorage, self).__init__(unique_id, children, size)

     if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 2:
       raise ValueError("Invalid configuration data %s" % str(unique_id))
     self.driver = unique_id[0]
     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]

@@ -1581,14 +1675,12 @@ class FileStorage(BlockDev):
 
     """
     if not os.path.exists(self.dev_path):
 
     """
     if not os.path.exists(self.dev_path):

-      raise errors.BlockDeviceError("File device '%s' does not exist." %
-                                    self.dev_path)
-    return True
+      _ThrowError("File device '%s' does not exist" % self.dev_path)

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

-    This is a no-op for the file type, as we don't deacivate
+    This is a no-op for the file type, as we don't deactivate

     the file on shutdown.
 
     """
     the file on shutdown.
 
     """

@@ -1645,11 +1737,11 @@ class FileStorage(BlockDev):
     @return: an instance of FileStorage
 
     """
     @return: an instance of FileStorage
 
     """

-    # TODO: decide whether we should check for existing files and
-    # abort or not

     if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 2:
       raise ValueError("Invalid configuration data %s" % str(unique_id))
     dev_path = unique_id[1]
     if not isinstance(unique_id, (tuple, list)) or len(unique_id) != 2:
       raise ValueError("Invalid configuration data %s" % str(unique_id))
     dev_path = unique_id[1]

+    if os.path.exists(dev_path):
+      _ThrowError("File already existing: %s", dev_path)

     try:
       f = open(dev_path, 'w')
       f.truncate(size * 1024 * 1024)
     try:
       f = open(dev_path, 'w')
       f.truncate(size * 1024 * 1024)

@@ -1657,7 +1749,7 @@ class FileStorage(BlockDev):
     except IOError, err:
       _ThrowError("Error in file creation: %", str(err))
 
     except IOError, err:
       _ThrowError("Error in file creation: %", str(err))
 

-    return FileStorage(unique_id, children)
+    return FileStorage(unique_id, children, size)

 
 
 DEV_MAP = {
 
 
 DEV_MAP = {

@@ -1667,7 +1759,7 @@ DEV_MAP = {
   }
 
 
   }
 
 

-def FindDevice(dev_type, unique_id, children):
+def FindDevice(dev_type, unique_id, children, size):

   """Search for an existing, assembled device.
 
   This will succeed only if the device exists and is assembled, but it
   """Search for an existing, assembled device.
 
   This will succeed only if the device exists and is assembled, but it

@@ -1676,13 +1768,13 @@ def FindDevice(dev_type, unique_id, children):
   """
   if dev_type not in DEV_MAP:
     raise errors.ProgrammerError("Invalid block device type '%s'" % dev_type)
   """
   if dev_type not in DEV_MAP:
     raise errors.ProgrammerError("Invalid block device type '%s'" % dev_type)

-  device = DEV_MAP[dev_type](unique_id, children)
+  device = DEV_MAP[dev_type](unique_id, children, size)

   if not device.attached:
     return None
   return device
 
 
   if not device.attached:
     return None
   return device
 
 

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

   """Try to attach or assemble an existing device.
 
   This will attach to assemble the device, as needed, to bring it
   """Try to attach or assemble an existing device.
 
   This will attach to assemble the device, as needed, to bring it

@@ -1691,11 +1783,8 @@ def Assemble(dev_type, unique_id, children):
   """
   if dev_type not in DEV_MAP:
     raise errors.ProgrammerError("Invalid block device type '%s'" % dev_type)
   """
   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.Assemble():
-    raise errors.BlockDeviceError("Can't find a valid block device for"
-                                  " %s/%s/%s" %
-                                  (dev_type, unique_id, children))
+  device = DEV_MAP[dev_type](unique_id, children, size)
+  device.Assemble()

   return device
 
 
   return device