10:23 a.m.
Until "Add a size() method..." patch these ought to be pretty easy to ack.
Add a size() method...puts a proportion of the MDRaidArrayDevice.size()
functionality into raid classes, and clarifies it a bit.
Use...replaces code in MDRaidArrayDevice.size() with call to raid.size() method.
All tests pass w/out modification...even better they did not pass until I
realized that the number of members and the length of the member list might
not be the same. So the tests are either useful or wrong.
The remaining are cleanup of methods that have become dead as the result of the
changes.
mulhern (11):
Make RAIDLevels iterable (#1085474)
Improve comments on a few methods (#1085474)
Rename _get_size to _trim, which describes its function better
(#1085474)
Rename get_raw_array_size to get_net_array_size (#1085474)
Log if there was a failure to calculate the size of the
MDRaidArrayDevice (#1085474)
Check whether type is mdbiosraidarray before checking smallest member
(#1085474)
Move line that might throw an MDRaid exception inside try block
(#1085474)
Add a size() method to the raid classes (#1085474)
Use raid.size method to get size of device (#1085474)
Remove unused get_size method (#1085474)
Removed some now unused methods from devices (#1085474)
blivet/devicelibs/mdraid.py | 5 +-
blivet/devicelibs/raid.py | 113 +++++++++++++++++++++++++------------
blivet/devices.py | 56 +++++-------------
tests/devicelibs_test/raid_test.py | 50 +++++++++++++---
tests/devices_test.py | 22 --------
5 files changed, 137 insertions(+), 109 deletions(-)
--
1.8.3.1
10:23 a.m.
New subject: [blivet:master 01/11] Make RAIDLevels iterable (#1085474)
Related: fed#1085474
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devicelibs/raid.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/blivet/devicelibs/raid.py b/blivet/devicelibs/raid.py
index ff08b68..d14e859 100644
--- a/blivet/devicelibs/raid.py
+++ b/blivet/devicelibs/raid.py
@@ -307,6 +307,9 @@ class RAIDLevels(object):
if not level in self._raid_levels:
self._raid_levels.append(level)
+ def __iter__(self):
+ return iter(self._raid_levels)
+
class RAID0(RAIDLevel):
level = property(lambda s: "0")
--
1.8.3.1
10:23 a.m.
New subject: [blivet:master 02/11] Improve comments on a few methods (#1085474)
Related: fed#1085474
Get types correct and expand descriptions.
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devicelibs/raid.py | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/blivet/devicelibs/raid.py b/blivet/devicelibs/raid.py
index d14e859..da72765 100644
--- a/blivet/devicelibs/raid.py
+++ b/blivet/devicelibs/raid.py
@@ -130,13 +130,20 @@ class RAIDLevel(object):
raise NotImplementedError()
def get_raw_array_size(self, member_count, smallest_member_size):
- """Return the raw arraysize.
+ """Return the space, essentially the number of bits available
+ for storage. This value is generally a function of the
+ smallest member size. If the smallest member size represents
+ the amount of data that can be stored on the smallest member,
+ then the result will represent the amount of data that can be
+ stored on the array. If the smallest member size represents
+ both data and metadata, then the result will represent the
+ available space in the array for both data and metadata.
:param int member_count: the number of members in the array
:param smallest_member_size: the size of the smallest
member of this array
:type smallest_member_size: :class:`~.size.Size`
- :returns: the array size, not including metadata or chunk size
+ :returns: the array size
:rtype: :class:`~.size.Size`
Raises a RaidError if member_count is fewer than the minimum
@@ -156,11 +163,16 @@ class RAIDLevel(object):
def get_size(self, member_count, smallest_member_size, chunk_size):
"""
+ Calculates the number of bits available on the this array modulo
+ the chunk size based on the smallest member size.
+
:param int member_count: the number of members in the array
- :param int smallest_member_size: the size of the smallest
+ :param smallest_member_size: the size of the smallest
member of this array
- :param int chunk_size: the smallest size this array allows
- :rtype: int
+ :type smallest_member_size: :class:`~.size.Size`
+ :param chunk_size: the smallest unit of size this array allows
+ :type chunk_size: :class:`~.size.Size`
+ :rtype: :class:`~.size.Size`
"""
size = self.get_raw_array_size(member_count, smallest_member_size)
return self._get_size(size, chunk_size)
--
1.8.3.1
10:23 a.m.
New subject: [blivet:master 03/11] Rename _get_size to _trim, which describes its function better (#1085474)
Related: fed#1085474
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devicelibs/raid.py | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/blivet/devicelibs/raid.py b/blivet/devicelibs/raid.py
index da72765..ff64ca9 100644
--- a/blivet/devicelibs/raid.py
+++ b/blivet/devicelibs/raid.py
@@ -175,11 +175,21 @@ class RAIDLevel(object):
:rtype: :class:`~.size.Size`
"""
size = self.get_raw_array_size(member_count, smallest_member_size)
- return self._get_size(size, chunk_size)
+ return self._trim(size, chunk_size)
@abc.abstractmethod
- def _get_size(self, size, chunk_size):
- """Helper function; not to be called directly."""
+ def _trim(self, size, chunk_size):
+ """Helper function; not to be called directly.
+
+ Trims size to the largest size that the level allows based on the
+ chunk_size.
+
+ :param size: the size of the array
+ :type size: :class:`~.size.Size`
+ :param chunk_size: the smallest unit of size this array allows
+ :type chunk_size: :class:`~.size.Size`
+ :rtype: :class:`~.size.Size`
+ """
raise NotImplementedError()
def get_recommended_stride(self, member_count):
@@ -338,7 +348,7 @@ class RAID0(RAIDLevel):
# smallest_member_size dictates the return type
return smallest_member_size * member_count
- def _get_size(self, size, chunk_size):
+ def _trim(self, size, chunk_size):
return size - size % chunk_size
def _get_recommended_stride(self, member_count):
@@ -361,7 +371,7 @@ class RAID1(RAIDLevel):
def _get_raw_array_size(self, member_count, smallest_member_size):
return smallest_member_size
- def _get_size(self, size, chunk_size):
+ def _trim(self, size, chunk_size):
return size
def _get_recommended_stride(self, member_count):
@@ -385,7 +395,7 @@ class RAID4(RAIDLevel):
# smallest_member_size dictates the return type
return smallest_member_size * (member_count - 1)
- def _get_size(self, size, chunk_size):
+ def _trim(self, size, chunk_size):
return size - size % chunk_size
def _get_recommended_stride(self, member_count):
@@ -409,7 +419,7 @@ class RAID5(RAIDLevel):
# smallest_member_size dictates the return type
return smallest_member_size * (member_count - 1)
- def _get_size(self, size, chunk_size):
+ def _trim(self, size, chunk_size):
return size - size % chunk_size
def _get_recommended_stride(self, member_count):
@@ -433,7 +443,7 @@ class RAID6(RAIDLevel):
# smallest_member_size dictates the return type
return smallest_member_size * (member_count - 2)
- def _get_size(self, size, chunk_size):
+ def _trim(self, size, chunk_size):
return size - size % chunk_size
def _get_recommended_stride(self, member_count):
@@ -457,7 +467,7 @@ class RAID10(RAIDLevel):
# smallest_member_size dictates the return type
return smallest_member_size * (member_count // 2)
- def _get_size(self, size, chunk_size):
+ def _trim(self, size, chunk_size):
return size
def _get_recommended_stride(self, member_count):
--
1.8.3.1
10:23 a.m.
New subject: [blivet:master 04/11] Rename get_raw_array_size to get_net_array_size (#1085474)
Related: fed#1085474
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devicelibs/raid.py | 25 ++++++++++---------------
blivet/devices.py | 2 +-
tests/devicelibs_test/raid_test.py | 18 +++++++++---------
3 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/blivet/devicelibs/raid.py b/blivet/devicelibs/raid.py
index ff64ca9..e6018bb 100644
--- a/blivet/devicelibs/raid.py
+++ b/blivet/devicelibs/raid.py
@@ -129,7 +129,7 @@ class RAIDLevel(object):
"""Helper function; not to be called directly."""
raise NotImplementedError()
- def get_raw_array_size(self, member_count, smallest_member_size):
+ def get_net_array_size(self, member_count, smallest_member_size):
"""Return the space, essentially the number of bits available
for storage. This value is generally a function of the
smallest member size. If the smallest member size represents
@@ -154,10 +154,10 @@ class RAIDLevel(object):
raise RaidError("%s requires at least %d disks" % (self.name,
self.min_members))
if smallest_member_size < 0:
raise RaidError("size is a negative number")
- return self._get_raw_array_size(member_count, smallest_member_size)
+ return self._get_net_array_size(member_count, smallest_member_size)
@abc.abstractmethod
- def _get_raw_array_size(self, member_count, smallest_member_size):
+ def _get_net_array_size(self, member_count, smallest_member_size):
"""Helper function; not to be called directly."""
raise NotImplementedError()
@@ -174,7 +174,7 @@ class RAIDLevel(object):
:type chunk_size: :class:`~.size.Size`
:rtype: :class:`~.size.Size`
"""
- size = self.get_raw_array_size(member_count, smallest_member_size)
+ size = self.get_net_array_size(member_count, smallest_member_size)
return self._trim(size, chunk_size)
@abc.abstractmethod
@@ -344,8 +344,7 @@ class RAID0(RAIDLevel):
def _get_base_member_size(self, size, member_count):
return div_up(size, member_count)
- def _get_raw_array_size(self, member_count, smallest_member_size):
- # smallest_member_size dictates the return type
+ def _get_net_array_size(self, member_count, smallest_member_size):
return smallest_member_size * member_count
def _trim(self, size, chunk_size):
@@ -368,7 +367,7 @@ class RAID1(RAIDLevel):
def _get_base_member_size(self, size, member_count):
return size
- def _get_raw_array_size(self, member_count, smallest_member_size):
+ def _get_net_array_size(self, member_count, smallest_member_size):
return smallest_member_size
def _trim(self, size, chunk_size):
@@ -391,8 +390,7 @@ class RAID4(RAIDLevel):
def _get_base_member_size(self, size, member_count):
return div_up(size, member_count - 1)
- def _get_raw_array_size(self, member_count, smallest_member_size):
- # smallest_member_size dictates the return type
+ def _get_net_array_size(self, member_count, smallest_member_size):
return smallest_member_size * (member_count - 1)
def _trim(self, size, chunk_size):
@@ -415,8 +413,7 @@ class RAID5(RAIDLevel):
def _get_base_member_size(self, size, member_count):
return div_up(size, (member_count - 1))
- def _get_raw_array_size(self, member_count, smallest_member_size):
- # smallest_member_size dictates the return type
+ def _get_net_array_size(self, member_count, smallest_member_size):
return smallest_member_size * (member_count - 1)
def _trim(self, size, chunk_size):
@@ -439,8 +436,7 @@ class RAID6(RAIDLevel):
def _get_base_member_size(self, size, member_count):
return div_up(size, member_count - 2)
- def _get_raw_array_size(self, member_count, smallest_member_size):
- # smallest_member_size dictates the return type
+ def _get_net_array_size(self, member_count, smallest_member_size):
return smallest_member_size * (member_count - 2)
def _trim(self, size, chunk_size):
@@ -463,8 +459,7 @@ class RAID10(RAIDLevel):
def _get_base_member_size(self, size, member_count):
return div_up(size, (member_count // 2))
- def _get_raw_array_size(self, member_count, smallest_member_size):
- # smallest_member_size dictates the return type
+ def _get_net_array_size(self, member_count, smallest_member_size):
return smallest_member_size * (member_count // 2)
def _trim(self, size, chunk_size):
diff --git a/blivet/devices.py b/blivet/devices.py
index 2671e88..d351b20 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -3264,7 +3264,7 @@ class MDRaidArrayDevice(ContainerDevice):
return 0
smallestMemberSize = smallestMember.size
- size = self.level.get_raw_array_size(self.memberDevices,
+ size = self.level.get_net_array_size(self.memberDevices,
smallestMemberSize)
log.debug("raw RAID %s size == %s", self.level, size)
return size
diff --git a/tests/devicelibs_test/raid_test.py b/tests/devicelibs_test/raid_test.py
index 424e5f2..15b193e 100644
--- a/tests/devicelibs_test/raid_test.py
+++ b/tests/devicelibs_test/raid_test.py
@@ -72,15 +72,15 @@ class RaidTestCase(unittest.TestCase):
-4, 4)
##
- ## get_raw_array_size
- ##
- self.assertEqual(raid.RAID0.get_raw_array_size(4, 2), 8)
- self.assertEqual(raid.RAID1.get_raw_array_size(4, 2), 2)
- self.assertEqual(raid.RAID4.get_raw_array_size(4, 2), 6)
- self.assertEqual(raid.RAID5.get_raw_array_size(4, 2), 6)
- self.assertEqual(raid.RAID6.get_raw_array_size(4, 2), 4)
- self.assertEqual(raid.RAID10.get_raw_array_size(4, 2), 4)
- self.assertEqual(raid.RAID10.get_raw_array_size(5, 2), 4)
+ ## get_net_array_size
+ ##
+ self.assertEqual(raid.RAID0.get_net_array_size(4, 2), 8)
+ self.assertEqual(raid.RAID1.get_net_array_size(4, 2), 2)
+ self.assertEqual(raid.RAID4.get_net_array_size(4, 2), 6)
+ self.assertEqual(raid.RAID5.get_net_array_size(4, 2), 6)
+ self.assertEqual(raid.RAID6.get_net_array_size(4, 2), 4)
+ self.assertEqual(raid.RAID10.get_net_array_size(4, 2), 4)
+ self.assertEqual(raid.RAID10.get_net_array_size(5, 2), 4)
##
## get_recommended_stride
--
1.8.3.1
4:08 a.m.
New subject: [blivet:master 04/11] Rename get_raw_array_size to get_net_array_size (#1085474)
I believe this commit deserves some explanation of the change in the
commit message.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
6:52 a.m.
New subject: [blivet:master 04/11] Rename get_raw_array_size to get_net_array_size (#1085474)
----- Original Message -----
From: "Vratislav Podzimek" <vpodzime(a)redhat.com>
To: "anaconda patch review" <anaconda-patches(a)lists.fedorahosted.org>
Sent: Monday, April 14, 2014 5:08:11 AM
Subject: Re: [blivet:master 04/11] Rename get_raw_array_size to get_net_array_size
(#1085474)
I believe this commit deserves some explanation of the change in the
commit message.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
_______________________________________________
anaconda-patches mailing list
anaconda-patches(a)lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
Done.
- mulhern
10:23 a.m.
New subject: [blivet:master 05/11] Log if there was a failure to calculate the size of the MDRaidArrayDevice (#1085474)
Related: fed#1085474
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devices.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/blivet/devices.py b/blivet/devices.py
index d351b20..bc64812 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -3301,7 +3301,8 @@ class MDRaidArrayDevice(ContainerDevice):
size = self.level.get_size(self.memberDevices,
smallestMemberSize,
self.chunkSize)
- except (errors.MDRaidError, errors.RaidError):
+ except (errors.MDRaidError, errors.RaidError) as e:
+ log.info("could not calculate size of device %s for raid level %s:
%s", self, self.level, e)
size = 0
log.debug("non-existent RAID %s size == %s", self.level, size)
else:
--
1.8.3.1
10:23 a.m.
New subject: [blivet:master 06/11] Check whether type is mdbiosraidarray before checking smallest member (#1085474)
Related: fed#1085474
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devices.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/blivet/devices.py b/blivet/devices.py
index bc64812..53bfbe3 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -3286,15 +3286,15 @@ class MDRaidArrayDevice(ContainerDevice):
"""Returns the actual or estimated size depending on whether or
not the array exists.
"""
- smallestMember = self.smallestMember
- if smallestMember is None:
- return 0
-
# For container members return probed size, as we cannot determine it
# when teared down.
if self.type == "mdbiosraidarray":
return self._size
+ smallestMember = self.smallestMember
+ if smallestMember is None:
+ return 0
+
smallestMemberSize = smallestMember.size - self.superBlockSize
if not self.exists or not self.partedDevice:
try:
--
1.8.3.1
10:23 a.m.
New subject: [blivet:master 07/11] Move line that might throw an MDRaid exception inside try block (#1085474)
Resolves: fed#1085474
If any of the raid or mdraid methods raise an exception the size will be 0.
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devices.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blivet/devices.py b/blivet/devices.py
index 53bfbe3..f6ed975 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -3295,9 +3295,9 @@ class MDRaidArrayDevice(ContainerDevice):
if smallestMember is None:
return 0
- smallestMemberSize = smallestMember.size - self.superBlockSize
if not self.exists or not self.partedDevice:
try:
+ smallestMemberSize = smallestMember.size - self.superBlockSize
size = self.level.get_size(self.memberDevices,
smallestMemberSize,
self.chunkSize)
--
1.8.3.1
10:23 a.m.
New subject: [blivet:master 08/11] Add a size() method to the raid classes (#1085474)
Related: fed#1085474
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devicelibs/mdraid.py | 3 +++
blivet/devicelibs/raid.py | 39 ++++++++++++++++++++++++++++++++++++++
tests/devicelibs_test/raid_test.py | 34 ++++++++++++++++++++++++++++++++-
3 files changed, 75 insertions(+), 1 deletion(-)
diff --git a/blivet/devicelibs/mdraid.py b/blivet/devicelibs/mdraid.py
index 1077400..1445167 100644
--- a/blivet/devicelibs/mdraid.py
+++ b/blivet/devicelibs/mdraid.py
@@ -57,6 +57,9 @@ class Container(object):
raise MDRaidError("get_size is not defined for level container.")
def get_raw_array_size(self, member_count, smallest_member_size):
raise MDRaidError("get_raw_array_size is not defined for level
container.")
+ def size(self, member_sizes, num_members=None, chunk_size=None,
superblock_size_func=None):
+ return sum(member_sizes)
+
def __str__(self):
return self.name
diff --git a/blivet/devicelibs/raid.py b/blivet/devicelibs/raid.py
index e6018bb..36453cd 100644
--- a/blivet/devicelibs/raid.py
+++ b/blivet/devicelibs/raid.py
@@ -212,6 +212,45 @@ class RAIDLevel(object):
"""Helper function; not to be called directly."""
raise NotImplementedError()
+ def size(self, member_sizes, num_members=None, chunk_size=None,
superblock_size_func=None):
+ """Estimate the amount of data that can be stored on this array.
+
+ :param member_size: a list of the sizes of members of this array
+ :type member_size: list of :class:`~.size.Size`
+ :param int num_members: the number of members in the array
+ :param chunk_size: the smallest unit of size for
+ :type chunk_size: :class:`~.size.Size`
+ :param superblock_size_func: a function that estimates the
+ superblock size for this array
+ :type superblock_size_func: a function from :class:`~.size.Size` to
+ :class:`~.size.Size`
+ :returns: an estimate of the amount of data that can be stored on
+ this array
+ :rtype: :class:`~.size.Size`
+
+ Note that the number of members in the array may not be the same
+ as the length of member_sizes if the array is still
+ under construction.
+ """
+ if not member_sizes:
+ return 0
+
+ if num_members is None:
+ num_members = len(member_sizes)
+
+ if chunk_size is None or chunk_size == 0:
+ raise RaidError("chunk_size parameter value %s is not acceptable")
+
+ if superblock_size_func is None:
+ raise RaidError("superblock_size_func value of None is not
acceptable")
+
+ min_size = min(member_sizes)
+ total_space = self.get_net_array_size(num_members, min_size)
+ superblock_size = superblock_size_func(total_space)
+ min_data_size = min_size - superblock_size
+ total_data_size = self.get_net_array_size(num_members, min_data_size)
+ return self._trim(total_data_size, chunk_size)
+
def __str__(self):
return self.name
diff --git a/tests/devicelibs_test/raid_test.py b/tests/devicelibs_test/raid_test.py
index 15b193e..34b5ba5 100644
--- a/tests/devicelibs_test/raid_test.py
+++ b/tests/devicelibs_test/raid_test.py
@@ -3,6 +3,7 @@ import unittest
import blivet.devicelibs.raid as raid
import blivet.errors as errors
+from blivet.size import Size
class RaidTestCase(unittest.TestCase):
@@ -95,7 +96,38 @@ class RaidTestCase(unittest.TestCase):
self.assertRaises(errors.RaidError, raid.RAID10.get_recommended_stride, 1)
-
+ ##
+ ## size
+ ##
+ for r in raid.RAIDLevels():
+ self.assertEqual(r.size([ Size(spec="32MiB"),
+ Size(spec="128MiB"),
+ Size(spec="128MiB"),
+ Size(spec="64MiB") ],
+ 4,
+ Size(spec="1MiB"),
+ lambda x: Size(bytes=0)),
+ r.get_net_array_size(4, Size(spec="32MiB")))
+
+ for r in raid.RAIDLevels():
+ self.assertEqual(r.size([ Size(spec="32MiB"),
+ Size(spec="128MiB"),
+ Size(spec="128MiB"),
+ Size(spec="64MiB") ],
+ 5,
+ Size(spec="1MiB"),
+ lambda x: Size(bytes=0)),
+ r.get_net_array_size(5, Size(spec="32MiB")))
+
+ for r in raid.RAIDLevels():
+ self.assertEqual(r.size([ Size(spec="32MiB"),
+ Size(spec="128MiB"),
+ Size(spec="128MiB"),
+ Size(spec="64MiB") ],
+ 4,
+ Size(spec="1MiB"),
+ lambda x: Size(spec="32MiB")),
+ 0)
##
## names
##
--
1.8.3.1
4:13 a.m.
New subject: [blivet:master 08/11] Add a size() method to the raid classes (#1085474)
On Fri, 2014-04-11 at 11:23 -0400, mulhern wrote:
Related: fed#1085474
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devicelibs/mdraid.py | 3 +++
blivet/devicelibs/raid.py | 39 ++++++++++++++++++++++++++++++++++++++
tests/devicelibs_test/raid_test.py | 34 ++++++++++++++++++++++++++++++++-
3 files changed, 75 insertions(+), 1 deletion(-)
diff --git a/blivet/devicelibs/mdraid.py b/blivet/devicelibs/mdraid.py
index 1077400..1445167 100644
--- a/blivet/devicelibs/mdraid.py
+++ b/blivet/devicelibs/mdraid.py
@@ -57,6 +57,9 @@ class Container(object):
raise MDRaidError("get_size is not defined for level container.")
def get_raw_array_size(self, member_count, smallest_member_size):
raise MDRaidError("get_raw_array_size is not defined for level
container.")
+ def size(self, member_sizes, num_members=None, chunk_size=None,
superblock_size_func=None):
+ return sum(member_sizes)
+
def __str__(self):
return self.name
diff --git a/blivet/devicelibs/raid.py b/blivet/devicelibs/raid.py
index e6018bb..36453cd 100644
--- a/blivet/devicelibs/raid.py
+++ b/blivet/devicelibs/raid.py
@@ -212,6 +212,45 @@ class RAIDLevel(object):
"""Helper function; not to be called directly."""
raise NotImplementedError()
+ def size(self, member_sizes, num_members=None, chunk_size=None,
superblock_size_func=None):
+ """Estimate the amount of data that can be stored on this array.
+
+ :param member_size: a list of the sizes of members of this array
+ :type member_size: list of :class:`~.size.Size`
+ :param int num_members: the number of members in the array
+ :param chunk_size: the smallest unit of size for
+ :type chunk_size: :class:`~.size.Size`
+ :param superblock_size_func: a function that estimates the
+ superblock size for this array
+ :type superblock_size_func: a function from :class:`~.size.Size` to
+ :class:`~.size.Size`
+ :returns: an estimate of the amount of data that can be stored on
+ this array
+ :rtype: :class:`~.size.Size`
+
+ Note that the number of members in the array may not be the same
+ as the length of member_sizes if the array is still
+ under construction.
+ """
+ if not member_sizes:
+ return 0
+
+ if num_members is None:
+ num_members = len(member_sizes)
+
+ if chunk_size is None or chunk_size == 0:
+ raise RaidError("chunk_size parameter value %s is not
acceptable")
+
+ if superblock_size_func is None:
+ raise RaidError("superblock_size_func value of None is not
acceptable")
+
+ min_size = min(member_sizes)
+ total_space = self.get_net_array_size(num_members, min_size)
+ superblock_size = superblock_size_func(total_space)
+ min_data_size = min_size - superblock_size
+ total_data_size = self.get_net_array_size(num_members, min_data_size)
+ return self._trim(total_data_size, chunk_size)
+
I think that 'get_size' would be a better name for a method.
'size'
sound more like a property.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
9:02 a.m.
New subject: [blivet:master 08/11] Add a size() method to the raid classes (#1085474)
----- Original Message -----
From: "Vratislav Podzimek" <vpodzime(a)redhat.com>
To: "anaconda patch review" <anaconda-patches(a)lists.fedorahosted.org>
Sent: Monday, April 14, 2014 5:13:48 AM
Subject: Re: [blivet:master 08/11] Add a size() method to the raid classes (#1085474)
On Fri, 2014-04-11 at 11:23 -0400, mulhern wrote:
> Related: fed#1085474
>
> Signed-off-by: mulhern <amulhern(a)redhat.com>
> ---
> blivet/devicelibs/mdraid.py | 3 +++
> blivet/devicelibs/raid.py | 39
> ++++++++++++++++++++++++++++++++++++++
> tests/devicelibs_test/raid_test.py | 34 ++++++++++++++++++++++++++++++++-
> 3 files changed, 75 insertions(+), 1 deletion(-)
>
> diff --git a/blivet/devicelibs/mdraid.py b/blivet/devicelibs/mdraid.py
> index 1077400..1445167 100644
> --- a/blivet/devicelibs/mdraid.py
> +++ b/blivet/devicelibs/mdraid.py
> @@ -57,6 +57,9 @@ class Container(object):
> raise MDRaidError("get_size is not defined for level
container.")
> def get_raw_array_size(self, member_count, smallest_member_size):
> raise MDRaidError("get_raw_array_size is not defined for level
> container.")
> + def size(self, member_sizes, num_members=None, chunk_size=None,
> superblock_size_func=None):
> + return sum(member_sizes)
> +
> def __str__(self):
> return self.name
>
> diff --git a/blivet/devicelibs/raid.py b/blivet/devicelibs/raid.py
> index e6018bb..36453cd 100644
> --- a/blivet/devicelibs/raid.py
> +++ b/blivet/devicelibs/raid.py
> @@ -212,6 +212,45 @@ class RAIDLevel(object):
> """Helper function; not to be called
directly."""
> raise NotImplementedError()
>
> + def size(self, member_sizes, num_members=None, chunk_size=None,
> superblock_size_func=None):
> + """Estimate the amount of data that can be stored on this
array.
> +
> + :param member_size: a list of the sizes of members of this
> array
> + :type member_size: list of :class:`~.size.Size`
> + :param int num_members: the number of members in the array
> + :param chunk_size: the smallest unit of size for
> + :type chunk_size: :class:`~.size.Size`
> + :param superblock_size_func: a function that estimates the
> + superblock size for this array
> + :type superblock_size_func: a function from
> :class:`~.size.Size` to
> + :class:`~.size.Size`
> + :returns: an estimate of the amount of data that can be stored
> on
> + this array
> + :rtype: :class:`~.size.Size`
> +
> + Note that the number of members in the array may not be the
> same
> + as the length of member_sizes if the array is still
> + under construction.
> + """
> + if not member_sizes:
> + return 0
> +
> + if num_members is None:
> + num_members = len(member_sizes)
> +
> + if chunk_size is None or chunk_size == 0:
> + raise RaidError("chunk_size parameter value %s is not
> acceptable")
> +
> + if superblock_size_func is None:
> + raise RaidError("superblock_size_func value of None is not
> acceptable")
> +
> + min_size = min(member_sizes)
> + total_space = self.get_net_array_size(num_members, min_size)
> + superblock_size = superblock_size_func(total_space)
> + min_data_size = min_size - superblock_size
> + total_data_size = self.get_net_array_size(num_members,
> min_data_size)
> + return self._trim(total_data_size, chunk_size)
> +
I think that 'get_size' would be a better name for a method. 'size'
sound more like a property.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
_______________________________________________
anaconda-patches mailing list
anaconda-patches(a)lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
Done.
- mulhern
10:23 a.m.
New subject: [blivet:master 09/11] Use raid.size method to get size of device (#1085474)
Resolves: fed#1085474
Requires modifying superBlockSize() so it can be passed as an argument to
size().
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devices.py | 25 ++++++++++++++-----------
tests/devices_test.py | 1 -
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/blivet/devices.py b/blivet/devices.py
index f6ed975..7bceb87 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -3269,9 +3269,16 @@ class MDRaidArrayDevice(ContainerDevice):
log.debug("raw RAID %s size == %s", self.level, size)
return size
- @property
- def superBlockSize(self):
- return mdraid.get_raid_superblock_size(self.rawArraySize,
+ def superBlockSize(self, raw_array_size):
+ """Estimate the superblock size for a member of an array,
+ given the total available memory for this array and raid level.
+
+ :param raw_array_size: total available for this array and level
+ :type raw_array_size: :class:`~.size.Size`
+ :returns: estimated superblock size
+ :rtype: :class:`~.size.Size`
+ """
+ return mdraid.get_raid_superblock_size(raw_array_size,
version=self.metadataVersion)
@property
@@ -3291,16 +3298,12 @@ class MDRaidArrayDevice(ContainerDevice):
if self.type == "mdbiosraidarray":
return self._size
- smallestMember = self.smallestMember
- if smallestMember is None:
- return 0
-
if not self.exists or not self.partedDevice:
try:
- smallestMemberSize = smallestMember.size - self.superBlockSize
- size = self.level.get_size(self.memberDevices,
- smallestMemberSize,
- self.chunkSize)
+ size = self.level.size([ d.size for d in self.devices ],
+ self.memberDevices,
+ self.chunkSize,
+ self.superBlockSize)
except (errors.MDRaidError, errors.RaidError) as e:
log.info("could not calculate size of device %s for raid level %s:
%s", self, self.level, e)
size = 0
diff --git a/tests/devices_test.py b/tests/devices_test.py
index 885f958..5d07f65 100644
--- a/tests/devices_test.py
+++ b/tests/devices_test.py
@@ -87,7 +87,6 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
"smallestMember" : self.assertIsNone,
"spares" : lambda x, m: self.assertEqual(x, 0, m),
"status" : self.assertFalse,
- "superBlockSize" : lambda x, m: self.assertEqual(x,
Size(spec="1 MiB"), m),
"sysfsPath" : lambda x, m: self.assertEqual(x, "", m),
"targetSize" : lambda x, m: self.assertEqual(x, Size(bytes=0), m),
"uuid" : self.assertIsNone,
--
1.8.3.1
4:12 a.m.
New subject: [blivet:master 09/11] Use raid.size method to get size of device (#1085474)
On Fri, 2014-04-11 at 11:23 -0400, mulhern wrote:
Resolves: fed#1085474
Requires modifying superBlockSize() so it can be passed as an argument to
size().
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devices.py | 25 ++++++++++++++-----------
tests/devices_test.py | 1 -
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/blivet/devices.py b/blivet/devices.py
index f6ed975..7bceb87 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -3269,9 +3269,16 @@ class MDRaidArrayDevice(ContainerDevice):
log.debug("raw RAID %s size == %s", self.level, size)
return size
- @property
- def superBlockSize(self):
- return mdraid.get_raid_superblock_size(self.rawArraySize,
+ def superBlockSize(self, raw_array_size):
+ """Estimate the superblock size for a member of an array,
+ given the total available memory for this array and raid level.
+
+ :param raw_array_size: total available for this array and level
+ :type raw_array_size: :class:`~.size.Size`
+ :returns: estimated superblock size
+ :rtype: :class:`~.size.Size`
+ """
+ return mdraid.get_raid_superblock_size(raw_array_size,
version=self.metadataVersion)
@property
@@ -3291,16 +3298,12 @@ class MDRaidArrayDevice(ContainerDevice):
if self.type == "mdbiosraidarray":
return self._size
- smallestMember = self.smallestMember
- if smallestMember is None:
- return 0
-
if not self.exists or not self.partedDevice:
try:
- smallestMemberSize = smallestMember.size - self.superBlockSize
- size = self.level.get_size(self.memberDevices,
- smallestMemberSize,
- self.chunkSize)
+ size = self.level.size([ d.size for d in self.devices ],
Please
drop the extra space in the square brackets.
+ self.memberDevices,
+ self.chunkSize,
+ self.superBlockSize)
except (errors.MDRaidError, errors.RaidError) as e:
log.info("could not calculate size of device %s for raid level %s:
%s", self, self.level, e)
size = 0
diff --git a/tests/devices_test.py b/tests/devices_test.py
index 885f958..5d07f65 100644
--- a/tests/devices_test.py
+++ b/tests/devices_test.py
@@ -87,7 +87,6 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
"smallestMember" : self.assertIsNone,
"spares" : lambda x, m: self.assertEqual(x, 0, m),
"status" : self.assertFalse,
- "superBlockSize" : lambda x, m: self.assertEqual(x,
Size(spec="1 MiB"), m),
"sysfsPath" : lambda x, m: self.assertEqual(x, "", m),
"targetSize" : lambda x, m: self.assertEqual(x, Size(bytes=0), m),
"uuid" : self.assertIsNone,
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
6:55 a.m.
New subject: [blivet:master 09/11] Use raid.size method to get size of device (#1085474)
----- Original Message -----
From: "Vratislav Podzimek" <vpodzime(a)redhat.com>
To: "anaconda patch review" <anaconda-patches(a)lists.fedorahosted.org>
Sent: Monday, April 14, 2014 5:12:50 AM
Subject: Re: [blivet:master 09/11] Use raid.size method to get size of device (#1085474)
On Fri, 2014-04-11 at 11:23 -0400, mulhern wrote:
> Resolves: fed#1085474
>
> Requires modifying superBlockSize() so it can be passed as an argument to
> size().
>
> Signed-off-by: mulhern <amulhern(a)redhat.com>
> ---
> blivet/devices.py | 25 ++++++++++++++-----------
> tests/devices_test.py | 1 -
> 2 files changed, 14 insertions(+), 12 deletions(-)
>
> diff --git a/blivet/devices.py b/blivet/devices.py
> index f6ed975..7bceb87 100644
> --- a/blivet/devices.py
> +++ b/blivet/devices.py
> @@ -3269,9 +3269,16 @@ class MDRaidArrayDevice(ContainerDevice):
> log.debug("raw RAID %s size == %s", self.level, size)
> return size
>
> - @property
> - def superBlockSize(self):
> - return mdraid.get_raid_superblock_size(self.rawArraySize,
> + def superBlockSize(self, raw_array_size):
> + """Estimate the superblock size for a member of an array,
> + given the total available memory for this array and raid level.
> +
> + :param raw_array_size: total available for this array and level
> + :type raw_array_size: :class:`~.size.Size`
> + :returns: estimated superblock size
> + :rtype: :class:`~.size.Size`
> + """
> + return mdraid.get_raid_superblock_size(raw_array_size,
> version=self.metadataVersion)
>
> @property
> @@ -3291,16 +3298,12 @@ class MDRaidArrayDevice(ContainerDevice):
> if self.type == "mdbiosraidarray":
> return self._size
>
> - smallestMember = self.smallestMember
> - if smallestMember is None:
> - return 0
> -
> if not self.exists or not self.partedDevice:
> try:
> - smallestMemberSize = smallestMember.size -
> self.superBlockSize
> - size = self.level.get_size(self.memberDevices,
> - smallestMemberSize,
> - self.chunkSize)
> + size = self.level.size([ d.size for d in self.devices ],
Please drop the extra space in the square brackets.
> + self.memberDevices,
> + self.chunkSize,
> + self.superBlockSize)
> except (errors.MDRaidError, errors.RaidError) as e:
> log.info("could not calculate size of device %s for raid
> level %s: %s", self, self.level, e)
> size = 0
> diff --git a/tests/devices_test.py b/tests/devices_test.py
> index 885f958..5d07f65 100644
> --- a/tests/devices_test.py
> +++ b/tests/devices_test.py
> @@ -87,7 +87,6 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
> "smallestMember" : self.assertIsNone,
> "spares" : lambda x, m: self.assertEqual(x, 0, m),
> "status" : self.assertFalse,
> - "superBlockSize" : lambda x, m: self.assertEqual(x,
> Size(spec="1 MiB"), m),
> "sysfsPath" : lambda x, m: self.assertEqual(x, "",
m),
> "targetSize" : lambda x, m: self.assertEqual(x,
Size(bytes=0),
> m),
> "uuid" : self.assertIsNone,
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
_______________________________________________
anaconda-patches mailing list
anaconda-patches(a)lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
Done.
- mulhern
11:34 a.m.
New subject: [blivet:master 09/11] Use raid.size method to get size of device (#1085474)
On 04/11/2014 10:23 AM, mulhern wrote:
Resolves: fed#1085474
Requires modifying superBlockSize() so it can be passed as an argument to
size().
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devices.py | 25 ++++++++++++++-----------
tests/devices_test.py | 1 -
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/blivet/devices.py b/blivet/devices.py
index f6ed975..7bceb87 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -3269,9 +3269,16 @@ class MDRaidArrayDevice(ContainerDevice):
log.debug("raw RAID %s size == %s", self.level, size)
return size
- @property
- def superBlockSize(self):
- return mdraid.get_raid_superblock_size(self.rawArraySize,
+ def superBlockSize(self, raw_array_size):
+ """Estimate the superblock size for a member of an array,
+ given the total available memory for this array and raid level.
+
+ :param raw_array_size: total available for this array and level
+ :type raw_array_size: :class:`~.size.Size`
+ :returns: estimated superblock size
+ :rtype: :class:`~.size.Size`
+ """
+ return mdraid.get_raid_superblock_size(raw_array_size,
version=self.metadataVersion)
Since this is now a method instead of a property you might as well
rename it getSuperBlockSize.
David
10:23 a.m.
New subject: [blivet:master 10/11] Remove unused get_size method (#1085474)
Resolves: fed#1085474
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devicelibs/mdraid.py | 2 --
blivet/devicelibs/raid.py | 16 ----------------
2 files changed, 18 deletions(-)
diff --git a/blivet/devicelibs/mdraid.py b/blivet/devicelibs/mdraid.py
index 1445167..fa5a5c9 100644
--- a/blivet/devicelibs/mdraid.py
+++ b/blivet/devicelibs/mdraid.py
@@ -53,8 +53,6 @@ class Container(object):
min_members = 1
def get_recommended_stride(self, member_devices):
return None
- def get_size(self, member_count, smallest_member_size, chunk_size):
- raise MDRaidError("get_size is not defined for level container.")
def get_raw_array_size(self, member_count, smallest_member_size):
raise MDRaidError("get_raw_array_size is not defined for level
container.")
def size(self, member_sizes, num_members=None, chunk_size=None,
superblock_size_func=None):
diff --git a/blivet/devicelibs/raid.py b/blivet/devicelibs/raid.py
index 36453cd..50c0625 100644
--- a/blivet/devicelibs/raid.py
+++ b/blivet/devicelibs/raid.py
@@ -161,22 +161,6 @@ class RAIDLevel(object):
"""Helper function; not to be called directly."""
raise NotImplementedError()
- def get_size(self, member_count, smallest_member_size, chunk_size):
- """
- Calculates the number of bits available on the this array modulo
- the chunk size based on the smallest member size.
-
- :param int member_count: the number of members in the array
- :param smallest_member_size: the size of the smallest
- member of this array
- :type smallest_member_size: :class:`~.size.Size`
- :param chunk_size: the smallest unit of size this array allows
- :type chunk_size: :class:`~.size.Size`
- :rtype: :class:`~.size.Size`
- """
- size = self.get_net_array_size(member_count, smallest_member_size)
- return self._trim(size, chunk_size)
-
@abc.abstractmethod
def _trim(self, size, chunk_size):
"""Helper function; not to be called directly.
--
1.8.3.1
10:23 a.m.
New subject: [blivet:master 11/11] Removed some now unused methods from devices (#1085474)
Resolves: fed#1085474
Update tests accordingly.
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/devices.py | 30 ------------------------------
tests/devices_test.py | 21 ---------------------
2 files changed, 51 deletions(-)
diff --git a/blivet/devices.py b/blivet/devices.py
index 7bceb87..bff2b1a 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -3246,29 +3246,6 @@ class MDRaidArrayDevice(ContainerDevice):
# bitmaps are not meaningful on raid0 according to mdadm-3.0.3
self.createBitmap = self._level.name != "raid0"
- @property
- def rawArraySize(self):
- """ Calculate the raw array size without taking into account
space
- reserved for metadata or chunkSize alignment.
-
- This is used to calculate the superBlockSize for v1.1 and v1.2
- metadata.
-
- Returns the raw size
-
- Raises an MDRaidError if this operation is not meaningful for the
- raid level.
- """
- smallestMember = self.smallestMember
- if smallestMember is None:
- return 0
-
- smallestMemberSize = smallestMember.size
- size = self.level.get_net_array_size(self.memberDevices,
- smallestMemberSize)
- log.debug("raw RAID %s size == %s", self.level, size)
- return size
-
def superBlockSize(self, raw_array_size):
"""Estimate the superblock size for a member of an array,
given the total available memory for this array and raid level.
@@ -3282,13 +3259,6 @@ class MDRaidArrayDevice(ContainerDevice):
version=self.metadataVersion)
@property
- def smallestMember(self):
- if not self.devices:
- return None
- else:
- return min(self.devices, key=lambda d: d.size)
-
- @property
def size(self):
"""Returns the actual or estimated size depending on whether or
not the array exists.
diff --git a/tests/devices_test.py b/tests/devices_test.py
index 5d07f65..34b10fb 100644
--- a/tests/devices_test.py
+++ b/tests/devices_test.py
@@ -81,10 +81,8 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
self.assertIsInstance(x, ParentList, m),
"path" : lambda x, m: self.assertRegexpMatches(x, "^/dev",
m),
"partitionable" : self.assertFalse,
- "rawArraySize" : lambda x, m: self.assertEqual(x, Size(bytes=0),
m),
"resizable" : self.assertFalse,
"size" : lambda x, m: self.assertEqual(x, Size(bytes=0), m),
- "smallestMember" : self.assertIsNone,
"spares" : lambda x, m: self.assertEqual(x, 0, m),
"status" : self.assertFalse,
"sysfsPath" : lambda x, m: self.assertEqual(x, "", m),
@@ -275,7 +273,6 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
memberDevices=lambda x, m: self.assertEqual(x, 2, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
partitionable=self.assertTrue,
- smallestMember=self.assertIsNotNone,
totalDevices=lambda x, m: self.assertEqual(x, 2, m),
type = lambda x, m: self.assertEqual(x,
"mdbiosraidarray", m))
@@ -295,14 +292,10 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
memberDevices=lambda x, m: self.assertEqual(x, 2, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
partitionable=self.assertTrue,
- smallestMember=self.assertIsNotNone,
targetSize=lambda x, m: self.assertEqual(x, Size(spec="32
MiB"), m),
totalDevices=lambda x, m: self.assertEqual(x, 2, m),
type=lambda x, m: self.assertEqual(x,
"mdbiosraidarray", m))
- ##
- ## rawArraySize tests
- ##
self.stateCheck(self.dev12,
devices=lambda x, m: self.assertEqual(len(x), 2, m),
isDisk=self.assertTrue,
@@ -311,8 +304,6 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
memberDevices=lambda x, m: self.assertEqual(x, 2, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
partitionable=self.assertTrue,
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="2
MiB"), m),
- smallestMember=self.assertIsNotNone,
targetSize=lambda x, m: self.assertEqual(x, Size(spec="32
MiB"), m),
totalDevices=lambda x, m: self.assertEqual(x, 2, m),
type = lambda x, m: self.assertEqual(x,
"mdbiosraidarray", m))
@@ -323,9 +314,7 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
level=lambda x, m: self.assertEqual(x.number, 0, m),
memberDevices=lambda x, m: self.assertEqual(x, 3, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="6
MiB"), m),
size=lambda x, m: self.assertEqual(x, Size(spec="3
MiB"), m),
- smallestMember=self.assertIsNotNone,
targetSize=lambda x, m: self.assertEqual(x, Size(spec="32
MiB"), m),
totalDevices=lambda x, m: self.assertEqual(x, 3, m))
@@ -334,9 +323,7 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
level=lambda x, m: self.assertEqual(x.number, 4, m),
memberDevices=lambda x, m: self.assertEqual(x, 3, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="4
MiB"), m),
size=lambda x, m: self.assertEqual(x, Size(spec="2
MiB"), m),
- smallestMember=self.assertIsNotNone,
totalDevices=lambda x, m: self.assertEqual(x, 3, m))
self.stateCheck(self.dev15,
@@ -344,9 +331,7 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
level=lambda x, m: self.assertEqual(x.number, 5, m),
memberDevices=lambda x, m: self.assertEqual(x, 3, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="4
MiB"), m),
size=lambda x, m: self.assertEqual(x, Size(spec="2
MiB"), m),
- smallestMember=self.assertIsNotNone,
totalDevices=lambda x, m: self.assertEqual(x, 3, m))
self.stateCheck(self.dev16,
@@ -354,9 +339,7 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
level=lambda x, m: self.assertEqual(x.number, 6, m),
memberDevices=lambda x, m: self.assertEqual(x, 4, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="4
MiB"), m),
size=lambda x, m: self.assertEqual(x, Size(spec="2
MiB"), m),
- smallestMember=self.assertIsNotNone,
totalDevices=lambda x, m: self.assertEqual(x, 4, m))
self.stateCheck(self.dev17,
@@ -364,9 +347,7 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
level=lambda x, m: self.assertEqual(x.number, 10, m),
memberDevices=lambda x, m: self.assertEqual(x, 4, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="4
MiB"), m),
size=lambda x, m: self.assertEqual(x, Size(spec="2
MiB"), m),
- smallestMember=self.assertIsNotNone,
totalDevices=lambda x, m: self.assertEqual(x, 4, m))
self.stateCheck(self.dev18,
@@ -374,9 +355,7 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
level=lambda x, m: self.assertEqual(x.number, 10, m),
memberDevices=lambda x, m: self.assertEqual(x, 4, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="4
MiB"), m),
size=lambda x, m: self.assertEqual(x, Size(spec="2
MiB"), m),
- smallestMember=self.assertIsNotNone,
spares=lambda x, m: self.assertEqual(x, 1, m),
totalDevices=lambda x, m: self.assertEqual(x, 5, m))
--
1.8.3.1
4:14 a.m.
On Fri, 2014-04-11 at 11:23 -0400, mulhern wrote:
Until "Add a size() method..." patch these ought to be
pretty easy to ack.
Add a size() method...puts a proportion of the MDRaidArrayDevice.size()
functionality into raid classes, and clarifies it a bit.
Use...replaces code in MDRaidArrayDevice.size() with call to raid.size() method.
All tests pass w/out modification...even better they did not pass until I
realized that the number of members and the length of the member list might
not be the same. So the tests are either useful or wrong.
The remaining are cleanup of methods that have become dead as the result of the
changes.
mulhern (11):
Make RAIDLevels iterable (#1085474)
Improve comments on a few methods (#1085474)
Rename _get_size to _trim, which describes its function better
(#1085474)
Rename get_raw_array_size to get_net_array_size (#1085474)
Log if there was a failure to calculate the size of the
MDRaidArrayDevice (#1085474)
Check whether type is mdbiosraidarray before checking smallest member
(#1085474)
Move line that might throw an MDRaid exception inside try block
(#1085474)
Add a size() method to the raid classes (#1085474)
Use raid.size method to get size of device (#1085474)
Remove unused get_size method (#1085474)
Removed some now unused methods from devices (#1085474)
blivet/devicelibs/mdraid.py | 5 +-
blivet/devicelibs/raid.py | 113 +++++++++++++++++++++++++------------
blivet/devices.py | 56 +++++-------------
tests/devicelibs_test/raid_test.py | 50 +++++++++++++---
tests/devices_test.py | 22 --------
5 files changed, 137 insertions(+), 109 deletions(-)
Other than those comments
these all look good to me.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
3671
days inactive
3691
days old
anaconda-patches@lists.fedorahosted.org
19 comments
3 participants
participants (3)
-
Anne Mulhern -
David Lehman -
Vratislav Podzimek