From bca2e7f45c7e8e6e5db9998b959df2058672b438 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sun, 14 Dec 2008 12:02:36 +0000
Subject: [PATCH] cleanup: fix backend._RecursiveFindBD
_RecursiveFindBD takes a parameter that isn't used; moreover, nowhere in
the SVN history can I find a case that it has been used.
As such, remove this parameter and fix its callers.
Reviewed-by: amishchenko
---
lib/backend.py | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/lib/backend.py b/lib/backend.py
index af93a6121..994d8e0d8 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -977,9 +977,7 @@ def RemoveBlockDevice(disk):
"""
try:
- # since we are removing the device, allow a partial match
- # this allows removal of broken mirrors
- rdev = _RecursiveFindBD(disk, allow_partial=True)
+ rdev = _RecursiveFindBD(disk)
except errors.BlockDeviceError, err:
# probably can't attach
logging.info("Can't attach to device %s in remove", disk)
@@ -1109,7 +1107,7 @@ def MirrorAddChildren(parent_cdev, new_cdevs):
@return: the success of the operation
"""
- parent_bdev = _RecursiveFindBD(parent_cdev, allow_partial=True)
+ parent_bdev = _RecursiveFindBD(parent_cdev)
if parent_bdev is None:
logging.error("Can't find parent device")
return False
@@ -1176,17 +1174,13 @@ def GetMirrorStatus(disks):
return stats
-def _RecursiveFindBD(disk, allow_partial=False):
+def _RecursiveFindBD(disk):
"""Check if a device is activated.
If so, return informations about the real device.
@type disk: L{objects.Disk}
@param disk: the disk object we need to find
- @type allow_partial: boolean
- @param allow_partial: if true, don't abort the find if a
- child of the device can't be found; this is intended
- to be used when repairing mirrors
@return: None if the device can't be found,
otherwise the device instance
--
GitLab