From 5a533f8a92087e9163f90711d0a36670357bd68d Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 11 Jun 2009 14:37:47 +0200
Subject: [PATCH] Simplify usage of backend._FindDisks
Since all users of _FindDisks now return new-style results, we can
simply make it raise an exception and not deal with the status field.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/backend.py | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/lib/backend.py b/lib/backend.py
index 8a3709a46..9d26319e9 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -2339,18 +2339,16 @@ def _FindDisks(nodes_ip, disks):
for cf in disks:
rd = _RecursiveFindBD(cf)
if rd is None:
- return (False, "Can't find device %s" % cf)
+ _Fail("Can't find device %s", cf)
bdevs.append(rd)
- return (True, bdevs)
+ return bdevs
def DrbdDisconnectNet(nodes_ip, disks):
"""Disconnects the network on a list of drbd devices.
"""
- status, bdevs = _FindDisks(nodes_ip, disks)
- if not status:
- return status, bdevs
+ bdevs = _FindDisks(nodes_ip, disks)
# disconnect disks
for rd in bdevs:
@@ -2366,9 +2364,7 @@ def DrbdAttachNet(nodes_ip, disks, instance_name, multimaster):
"""Attaches the network on a list of drbd devices.
"""
- status, bdevs = _FindDisks(nodes_ip, disks)
- if not status:
- return status, bdevs
+ bdevs = _FindDisks(nodes_ip, disks)
if multimaster:
for idx, rd in enumerate(bdevs):
@@ -2429,9 +2425,7 @@ def DrbdWaitSync(nodes_ip, disks):
"""Wait until DRBDs have synchronized.
"""
- status, bdevs = _FindDisks(nodes_ip, disks)
- if not status:
- return status, bdevs
+ bdevs = _FindDisks(nodes_ip, disks)
min_resync = 100
alldone = True
--
GitLab