[blivet:master 09/11] Accept None for btrfs raid levels (#1109195)

mulhern amulhern at redhat.com
Tue Jun 17 15:08:00 UTC 2014


Resolves: fed#1109195

None means None was assigned, so accept any default that, e.g., mkfs.btrfs
decides on. This default is hard to predict, as it may vary with the size of
the backing device as well as other factors.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/devices.py | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/blivet/devices.py b/blivet/devices.py
index 430ff62..d488422 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -5084,15 +5084,9 @@ class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice):
             :param value: new raid level
             :param type:  a valid raid level descriptor
             :returns:     None
-
-            If no raid level is specified then the best choice is single
-            since it can accomodate devices of different sizes.
         """
         # pylint: disable=attribute-defined-outside-init
-        if value is None:
-            self._dataLevel = btrfs.RAID_levels.raidLevel("single")
-        else:
-            self._dataLevel = btrfs.RAID_levels.raidLevel(value)
+        self._dataLevel = btrfs.RAID_levels.raidLevel(value) if value else None
 
     @property
     def metaDataLevel(self):
@@ -5110,19 +5104,9 @@ class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice):
             :param value: new raid level
             :param type:  a valid raid level descriptor
             :returns:     None
-
-            If no raid level is specified and there are multiple devices,
-            best choice is the default that mkfs.btrfs chooses, raid1.
-            If there is only one device, the best default is dup.
         """
         # pylint: disable=attribute-defined-outside-init
-        if value is None:
-            if len(self.parents) > 1:
-                self._metaDataLevel = btrfs.metadata_levels.raidLevel("raid1")
-            else:
-                self._metaDataLevel = btrfs.metadata_levels.raidLevel("dup")
-        else:
-            self._metaDataLevel = btrfs.RAID_levels.raidLevel(value)
+        self._metaDataLevel = btrfs.RAID_levels.raidLevel(value) if value else None
 
     @property
     def formatImmutable(self):
-- 
1.9.3



More information about the anaconda-patches mailing list