From 0950fd8f81de572f7240000d9d3c662492c885fa Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Mon, 5 Oct 2015 13:32:13 -0400 Subject: [PATCH 1/3] Upgrade to mdadm-3.3.4 Resolves: bz#1246474 Signed-off-by: Jes Sorensen --- .gitignore | 1 + mdadm.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e7afe43..b2c897b 100644 --- a/.gitignore +++ b/.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 diff --git a/mdadm.spec b/mdadm.spec index ea72905..26372b8 100644 --- a/mdadm.spec +++ b/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: 1%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz Source1: mdmonitor.init Source2: raid-check @@ -102,6 +102,10 @@ rm -rf %{buildroot} /etc/libreport/events.d/* %changelog +* Mon Oct 5 2015 Jes Sorensen - 3.3.4-1 +- Upgrade to mdadm-3.3.4 +- Resolves bz1246474 + * Wed Jun 17 2015 Fedora Release Engineering - 3.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 004cfff..7c7342a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -44698d351501cac6a89072dc877eb220 mdadm-3.3.2.tar.xz +7ca8b114710f98f53f20c5787b674a09 mdadm-3.3.4.tar.xz From 17c08f77840c7fdbd1da136177042489eb49b661 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Mon, 5 Oct 2015 13:56:02 -0400 Subject: [PATCH 2/3] Fix race when assembling or stopping IMSM RAID arrays Resolves: bz#1268955 Signed-off-by: Jes Sorensen --- mdadm.rules | 11 ----------- mdadm.spec | 6 +++++- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/mdadm.rules b/mdadm.rules index 73e9c83..5f3950e 100644 --- a/mdadm.rules +++ b/mdadm.rules @@ -62,15 +62,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" diff --git a/mdadm.spec b/mdadm.spec index 26372b8..b8b2610 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz Source1: mdmonitor.init Source2: raid-check @@ -102,6 +102,10 @@ rm -rf %{buildroot} /etc/libreport/events.d/* %changelog +* Mon Oct 5 2015 Jes Sorensen - 3.3.4-2 +- Fix race when assembling or stopping IMSM RAID arrays +- Resolves bz1268955 + * Mon Oct 5 2015 Jes Sorensen - 3.3.4-1 - Upgrade to mdadm-3.3.4 - Resolves bz1246474 From 82fff1474c3a7d79a11c0674f598383b4a8708ed Mon Sep 17 00:00:00 2001 From: Xiao Ni Date: Mon, 30 May 2016 23:54:49 +0800 Subject: [PATCH 3/3] Fix Degraded Raid1 array becomes inactive after rebooting Resolves: bz#1337003 Signed-off-by: Xiao Ni --- mdadm.rules | 4 +++- mdadm.spec | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mdadm.rules b/mdadm.rules index 5f3950e..8fcaf27 100644 --- a/mdadm.rules +++ b/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}" diff --git a/mdadm.spec b/mdadm.spec index b8b2610..4291557 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.3.4 -Release: 2%{?dist} +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,10 @@ rm -rf %{buildroot} /etc/libreport/events.d/* %changelog +* Mon May 30 2016 Xiao Ni - 3.3.4-3 +- Fix Degraded Raid1 array becomes inactive after rebooting +- Resolves bz1337003 + * Mon Oct 5 2015 Jes Sorensen - 3.3.4-2 - Fix race when assembling or stopping IMSM RAID arrays - Resolves bz1268955