Fix Degraded Raid1 array becomes inactive after rebooting

Resolves: bz#1337003

Signed-off-by: Xiao Ni <xni@redhat.com>

.gitignore

@@ -18,3 +18,4 @@ clog
 /mdadm-3.3.tar.xz
 /mdadm-3.3.1.tar.xz
 /mdadm-3.3.2.tar.xz
+/mdadm-3.3.4.tar.xz

mdadm.rules

@@ -25,7 +25,9 @@ ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="md_end"
 # anything here, just regular disks, and this also won't get any imsm
 # array members either)
 SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="linux_raid_member", \
-	RUN+="/sbin/mdadm -I $env{DEVNAME}"
+	IMPORT{program}="/sbin/mdadm -I $env{DEVNAME} --export $devnode --offroot ${DEVLINKS}"
+SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="linux_raid_member", \
+	ENV{MD_STARTED}=="*unsafe*", ENV{MD_FOREIGN}=="no", ENV{SYSTEMD_WANTS}+="mdadm-last-resort@$env{MD_DEVICE}.timer"
 SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}=="?*", \
 	ENV{ID_FS_TYPE}=="linux_raid_member", \
 	RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
@@ -62,15 +64,4 @@ LABEL="dm_change_end"
 KERNEL=="md*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \
 	ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}"
 
-# In case the initramfs only started some of the arrays in our container,
-# run incremental assembly on the container itself.  Note: we ran mdadm
-# on the container in 64-md-raid.rules, and that's how the MD_LEVEL
-# environment variable is already set.  If that disappears from the other
-# file, we will need to add this line into the middle of the next rule:
-#	IMPORT{program}="/sbin/mdadm -D --export $tempnode", \
-
-SUBSYSTEM=="block", ACTION=="add|change", KERNEL=="md*", \
-	ENV{MD_LEVEL}=="container", RUN+="/sbin/mdadm -I $env{DEVNAME}"
-
-
 LABEL="md_end"

mdadm.spec

@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
-Version:     3.3.2
-Release:     2%{?dist}
+Version:     3.3.4
+Release:     3%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -102,6 +102,18 @@ rm -rf %{buildroot}
 /etc/libreport/events.d/*
 
 %changelog
+* Mon May 30 2016 Xiao Ni <xni@redhat.com> - 3.3.4-3
+- Fix Degraded Raid1 array becomes inactive after rebooting
+- Resolves bz1337003
+
+* Mon Oct 5 2015 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.3.4-2
+- Fix race when assembling or stopping IMSM RAID arrays
+- Resolves bz1268955
+
+* Mon Oct 5 2015 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.3.4-1
+- Upgrade to mdadm-3.3.4
+- Resolves bz1246474
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

sources

@@ -1 +1 @@
-44698d351501cac6a89072dc877eb220  mdadm-3.3.2.tar.xz
+7ca8b114710f98f53f20c5787b674a09  mdadm-3.3.4.tar.xz