anaconda/sme9/0005-DegradedRAID1.patch

diff -ruN anaconda-13.21.195.upstream/storage/devicelibs/mdraid.py updates/storage/devicelibs/mdraid.py
--- anaconda-13.21.195.upstream/storage/devicelibs/mdraid.py    2012-11-26 12:42:03.000000000 -0800
+++ updates/storage/devicelibs/mdraid.py        2013-10-20 16:13:54.000000000 -0700
@@ -100,7 +100,7 @@
                         RAID6: 4,
                         RAID5: 3,
                         RAID4: 3,
-                        RAID1: 2,
+                        RAID1: 1,
                         RAID0: 2}
 
     for raid, min_members in raid_min_members.items():
diff -ruN anaconda-13.21.215.upstream/storage/devices.py updates/storage/devices.py
--- anaconda-13.21.215.upstream/storage/devices.py      2012-12-10 15:40:04.000000000 -0800
+++ updates/storage/devices.py  2013-12-02 20:19:32.000000000 -0800
@@ -3145,6 +3150,11 @@
 
             disks = [disk.path for disk in self.devices]
             spares = len(self.devices) - self.memberDevices
+
+            # allow creation of degraded arrays
+            if len(disks) == 1:
+                disks.append("missing")
+
             mdraid.mdcreate(self.path,
                             self.level,
                             disks,
diff -ruN anaconda-13.21.195.upstream/storage/devicetree.py updates/storage/devicetree.py
--- anaconda-13.21.195.upstream/storage/devicetree.py   2012-12-18 17:17:19.000000000 -0800
+++ updates/storage/devicetree.py       2013-07-30 14:25:43.000000000 -0700
@@ -2051,7 +2051,11 @@
 
         # remove md array devices for which we did not find all members
         for array in self.getDevicesByType("mdarray"):
-            if array.memberDevices > len(array.parents):
+            # Exception: allow degraded RAID1 arrays to be detected
+            if (array.level == 1) and (array.memberDevices-1) == len(array.parents):
+                log.warning("RAID1 array %s is degraded - %d of %d members found." % \
+                                (array.name, len(array.parents), array.memberDevices))
+            elif array.memberDevices > len(array.parents):
                 self._recursiveRemove(array)
 
     def _recursiveRemove(self, device):
diff -ruN anaconda-13.21.195.upstream/storage/partspec.py updates/storage/partspec.py
--- anaconda-13.21.195.upstream/storage/partspec.py     2012-11-26 12:42:03.000000000 -0800
+++ updates/storage/partspec.py 2013-07-30 14:25:43.000000000 -0700
@@ -22,7 +22,7 @@
 class PartSpec(object):
     def __init__(self, mountpoint=None, fstype=None, size=None, maxSize=None,
                  grow=False, asVol=False, singlePV=False, weight=0,
-                 requiredSpace=0):
+                 requiredSpace=0, useRAID=False):
         """ Create a new storage specification.  These are used to specify
             the default partitioning layout as an object before we have the
             storage system up and running.  The attributes are obvious
@@ -45,6 +45,8 @@
                              other LVs are created inside it.  If not enough
                              space exists, this PartSpec will never get turned
                              into an LV.
+            useRAID -- Should a RAID1 array be created for this volume?  If
+                       not, it will be allocated as a partition.
         """
 
         self.mountpoint = mountpoint
@@ -56,6 +58,7 @@
         self.singlePV = singlePV
         self.weight = weight
         self.requiredSpace = requiredSpace
+        self.useRAID = useRAID
 
         if self.singlePV and not self.asVol:
             self.asVol = True
diff -ruN anaconda-13.21.195/storage/partitioning.py.orig anaconda-13.21.195/storage/partitioning.py
--- anaconda-13.21.215/storage/partitioning.py.orig     2013-08-02 09:47:00.000000000 -0400
+++ anaconda-13.21.215/storage/partitioning.py  2014-01-03 16:38:31.954668243 -0500
@@ -64,6 +64,41 @@
 
     # create a separate pv partition for each disk with free space
     devs = []
+
+    # if there's no partition requests with asVol==True, then there's no
+    # need to create any pv partitions
+    requested_lvm_partitions = False
+    for request in anaconda.id.storage.autoPartitionRequests:
+        if request.asVol:
+            requested_lvm_partitions = True
+            break
+
+    if not requested_lvm_partitions:
+        return (disks, devs)
+
+    # if using RAID1, create free space partitions as RAID1 members
+    # so they can later be combined into a single pv partition
+    requested_raid_partitions = False
+    for request in anaconda.id.storage.autoPartitionRequests:
+        if request.useRAID and request.mountpoint == '/':
+            requested_raid_partitions = True
+            break
+
+    if requested_raid_partitions:
+        raid_devs = []
+        for disk in disks:
+            dev = anaconda.id.storage.newPartition(fmt_type="mdmember", size=1, grow=True, disks=[disk])
+            anaconda.id.storage.createDevice(dev)
+            raid_devs.append(dev)
+
+        # use minor="1" so that /dev/md1 is the PV, and /dev/md0 is /boot
+        part = anaconda.id.storage.newMDArray(fmt_type="lvmpv", minor="1", level="raid1", parents=raid_devs, memberDevices=len(raid_devs))
+        anaconda.id.storage.createDevice(part)
+        devs.append(part)
+
+        return (disks, devs)
+
+    # original default case
     for disk in disks:
         if anaconda.id.storage.encryptedAutoPart:
             fmt_type = "luks"
@@ -94,6 +129,24 @@
         if request.asVol:
             continue
 
+        if request.useRAID:
+            log.info("partitioning: RAID1 requested for %s" % request.mountpoint)
+
+            raid_devs = []
+            for disk in disks:
+                dev = anaconda.id.storage.newPartition(fmt_type="mdmember",
+                          size=request.size, grow=request.grow, maxsize=request.maxSize,
+                          mountpoint=request.mountpoint, disks=[disk], weight=request.weight)
+                anaconda.id.storage.createDevice(dev)
+                raid_devs.append(dev)
+
+            dev = anaconda.id.storage.newMDArray(fmt_type=request.fstype,
+                      mountpoint=request.mountpoint, level="raid1",
+                      parents=raid_devs, memberDevices=len(raid_devs))
+            anaconda.id.storage.createDevice(dev)
+
+            continue
+
         if request.fstype is None:
             request.fstype = anaconda.id.storage.defaultFSType
         elif request.fstype == "prepboot":
@@ -145,6 +198,9 @@
     return
 
 def _scheduleLVs(anaconda, devs):
+    if not devs:
+        return
+
     if anaconda.id.storage.encryptedAutoPart:
         pvs = []
         for dev in devs:
1	wellsi	1.1	diff -ruN anaconda-13.21.195.upstream/storage/devicelibs/mdraid.py updates/storage/devicelibs/mdraid.py
2			--- anaconda-13.21.195.upstream/storage/devicelibs/mdraid.py 2012-11-26 12:42:03.000000000 -0800
3			+++ updates/storage/devicelibs/mdraid.py 2013-10-20 16:13:54.000000000 -0700
4			@@ -100,7 +100,7 @@
5			RAID6: 4,
6			RAID5: 3,
7			RAID4: 3,
8			- RAID1: 2,
9			+ RAID1: 1,
10			RAID0: 2}
11
12			for raid, min_members in raid_min_members.items():
13	charliebrady	1.2	diff -ruN anaconda-13.21.215.upstream/storage/devices.py updates/storage/devices.py
14			--- anaconda-13.21.215.upstream/storage/devices.py 2012-12-10 15:40:04.000000000 -0800
15	wellsi	1.1	+++ updates/storage/devices.py 2013-12-02 20:19:32.000000000 -0800
16	charliebrady	1.2	@@ -3145,6 +3150,11 @@
17	wellsi	1.1
18			disks = [disk.path for disk in self.devices]
19			spares = len(self.devices) - self.memberDevices
20			+
21			+ # allow creation of degraded arrays
22			+ if len(disks) == 1:
23			+ disks.append("missing")
24			+
25			mdraid.mdcreate(self.path,
26			self.level,
27			disks,
28			diff -ruN anaconda-13.21.195.upstream/storage/devicetree.py updates/storage/devicetree.py
29			--- anaconda-13.21.195.upstream/storage/devicetree.py 2012-12-18 17:17:19.000000000 -0800
30			+++ updates/storage/devicetree.py 2013-07-30 14:25:43.000000000 -0700
31			@@ -2051,7 +2051,11 @@
32
33			# remove md array devices for which we did not find all members
34			for array in self.getDevicesByType("mdarray"):
35			- if array.memberDevices > len(array.parents):
36			+ # Exception: allow degraded RAID1 arrays to be detected
37			+ if (array.level == 1) and (array.memberDevices-1) == len(array.parents):
38			+ log.warning("RAID1 array %s is degraded - %d of %d members found." % \
39			+ (array.name, len(array.parents), array.memberDevices))
40			+ elif array.memberDevices > len(array.parents):
41			self._recursiveRemove(array)
42
43			def _recursiveRemove(self, device):
44	charliebrady	1.2	diff -ruN anaconda-13.21.195.upstream/storage/partspec.py updates/storage/partspec.py
45			--- anaconda-13.21.195.upstream/storage/partspec.py 2012-11-26 12:42:03.000000000 -0800
46			+++ updates/storage/partspec.py 2013-07-30 14:25:43.000000000 -0700
47			@@ -22,7 +22,7 @@
48			class PartSpec(object):
49			def __init__(self, mountpoint=None, fstype=None, size=None, maxSize=None,
50			grow=False, asVol=False, singlePV=False, weight=0,
51			- requiredSpace=0):
52			+ requiredSpace=0, useRAID=False):
53			""" Create a new storage specification. These are used to specify
54			the default partitioning layout as an object before we have the
55			storage system up and running. The attributes are obvious
56			@@ -45,6 +45,8 @@
57			other LVs are created inside it. If not enough
58			space exists, this PartSpec will never get turned
59			into an LV.
60			+ useRAID -- Should a RAID1 array be created for this volume? If
61			+ not, it will be allocated as a partition.
62			"""
63
64			self.mountpoint = mountpoint
65			@@ -56,6 +58,7 @@
66			self.singlePV = singlePV
67			self.weight = weight
68			self.requiredSpace = requiredSpace
69			+ self.useRAID = useRAID
70
71			if self.singlePV and not self.asVol:
72			self.asVol = True
73			diff -ruN anaconda-13.21.195/storage/partitioning.py.orig anaconda-13.21.195/storage/partitioning.py
74			--- anaconda-13.21.215/storage/partitioning.py.orig 2013-08-02 09:47:00.000000000 -0400
75			+++ anaconda-13.21.215/storage/partitioning.py 2014-01-03 16:38:31.954668243 -0500
76	wellsi	1.1	@@ -64,6 +64,41 @@
77
78			# create a separate pv partition for each disk with free space
79			devs = []
80			+
81			+ # if there's no partition requests with asVol==True, then there's no
82			+ # need to create any pv partitions
83			+ requested_lvm_partitions = False
84			+ for request in anaconda.id.storage.autoPartitionRequests:
85			+ if request.asVol:
86			+ requested_lvm_partitions = True
87			+ break
88			+
89			+ if not requested_lvm_partitions:
90			+ return (disks, devs)
91			+
92			+ # if using RAID1, create free space partitions as RAID1 members
93			+ # so they can later be combined into a single pv partition
94			+ requested_raid_partitions = False
95			+ for request in anaconda.id.storage.autoPartitionRequests:
96			+ if request.useRAID and request.mountpoint == '/':
97			+ requested_raid_partitions = True
98			+ break
99			+
100			+ if requested_raid_partitions:
101			+ raid_devs = []
102			+ for disk in disks:
103			+ dev = anaconda.id.storage.newPartition(fmt_type="mdmember", size=1, grow=True, disks=[disk])
104			+ anaconda.id.storage.createDevice(dev)
105			+ raid_devs.append(dev)
106			+
107			+ # use minor="1" so that /dev/md1 is the PV, and /dev/md0 is /boot
108			+ part = anaconda.id.storage.newMDArray(fmt_type="lvmpv", minor="1", level="raid1", parents=raid_devs, memberDevices=len(raid_devs))
109			+ anaconda.id.storage.createDevice(part)
110			+ devs.append(part)
111			+
112			+ return (disks, devs)
113			+
114			+ # original default case
115			for disk in disks:
116			if anaconda.id.storage.encryptedAutoPart:
117			fmt_type = "luks"
118			@@ -94,6 +129,24 @@
119			if request.asVol:
120			continue
121
122			+ if request.useRAID:
123			+ log.info("partitioning: RAID1 requested for %s" % request.mountpoint)
124			+
125			+ raid_devs = []
126			+ for disk in disks:
127			+ dev = anaconda.id.storage.newPartition(fmt_type="mdmember",
128			+ size=request.size, grow=request.grow, maxsize=request.maxSize,
129			+ mountpoint=request.mountpoint, disks=[disk], weight=request.weight)
130			+ anaconda.id.storage.createDevice(dev)
131			+ raid_devs.append(dev)
132			+
133			+ dev = anaconda.id.storage.newMDArray(fmt_type=request.fstype,
134			+ mountpoint=request.mountpoint, level="raid1",
135			+ parents=raid_devs, memberDevices=len(raid_devs))
136			+ anaconda.id.storage.createDevice(dev)
137			+
138			+ continue
139			+
140			if request.fstype is None:
141			request.fstype = anaconda.id.storage.defaultFSType
142			elif request.fstype == "prepboot":
143	charliebrady	1.2	@@ -145,6 +198,9 @@
144	wellsi	1.1	return
145
146			def _scheduleLVs(anaconda, devs):
147			+ if not devs:
148			+ return
149			+
150			if anaconda.id.storage.encryptedAutoPart:
151			pvs = []
152			for dev in devs: