1c8fb911e6
- Update for latest mdadm-4.1+ patches, this is required by jsc#SLE-10078 and jsc#SLE-9348. Mostly the purpose is for latest Intel IMSM raid support. The following patches also include previous patches with new re-ordered prefix numbers. - Makefile: install mdadm_env.sh to /usr/lib/mdadm (bsc#1111960) 0000-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch - Assemble: keep MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY flag (jsc#SLE-10078, jsc#SLE-9348) 0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch - Document PART-POLICY lines (jsc#SLE-10078, jsc#SLE-9348) 0002-Document-PART-POLICY-lines.patc - policy: support devices with multiple paths. (jsc#SLE-10078, jsc#SLE-9348) 0003-policy-support-devices-with-multiple-paths.patch - mdcheck: add systemd unit files to run mdcheck. (bsc#1115407) 0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch - Monitor: add system timer to run --oneshot periodically (bsc#1115407) 0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch - imsm: update metadata correctly while raid10 double (jsc#SLE-10078, jsc#SLE-9348) 0006-imsm-update-metadata-correctly-while-raid10-double-d.patch - Assemble: mask FAILFAST and WRITEMOSTLY flags when finding (jsc#SLE-10078, jsc#SLE-9348) 0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch - Grow: avoid overflow in compute_backup_blocks() (jsc#SLE-10078, jsc#SLE-9348) 0008-Grow-avoid-overflow-in-compute_backup_blocks.patch - Grow: report correct new chunk size. (jsc#SLE-10078, jsc#SLE-9348) 0009-Grow-report-correct-new-chunk-size.patch OBS-URL: https://build.opensuse.org/request/show/781064 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=181
57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From 2b57e4fe041d52ae29866c93a878a11c07223cff Mon Sep 17 00:00:00 2001
|
|
From: Pawel Baldysiak <pawel.baldysiak@intel.com>
|
|
Date: Fri, 22 Feb 2019 12:56:27 +0100
|
|
Subject: [PATCH] Assemble: Fix starting array with initial reshape checkpoint
|
|
Git-commit: 2b57e4fe041d52ae29866c93a878a11c07223cff
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
If array was stopped during reshape initialization,
|
|
there might be a "0" checkpoint recorded in metadata.
|
|
If array with such condition (reshape with position 0)
|
|
is passed to kernel - it will refuse to start such array.
|
|
|
|
Treat such array as normal during assemble, Grow_continue() will
|
|
reinitialize and start the reshape.
|
|
|
|
Signed-off-by: Pawel Baldysiak <pawel.baldysiak@intel.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
Assemble.c | 18 ++++++++++++++++--
|
|
1 file changed, 16 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Assemble.c b/Assemble.c
|
|
index 9f050c1..420c7b3 100644
|
|
--- a/Assemble.c
|
|
+++ b/Assemble.c
|
|
@@ -2061,8 +2061,22 @@ int assemble_container_content(struct supertype *st, int mdfd,
|
|
spare, &c->backup_file, c->verbose) == 1)
|
|
return 1;
|
|
|
|
- err = sysfs_set_str(content, NULL,
|
|
- "array_state", "readonly");
|
|
+ if (content->reshape_progress == 0) {
|
|
+ /* If reshape progress is 0 - we are assembling the
|
|
+ * array that was stopped, before reshape has started.
|
|
+ * Array needs to be started as active, Grow_continue()
|
|
+ * will start the reshape.
|
|
+ */
|
|
+ sysfs_set_num(content, NULL, "reshape_position",
|
|
+ MaxSector);
|
|
+ err = sysfs_set_str(content, NULL,
|
|
+ "array_state", "active");
|
|
+ sysfs_set_num(content, NULL, "reshape_position", 0);
|
|
+ } else {
|
|
+ err = sysfs_set_str(content, NULL,
|
|
+ "array_state", "readonly");
|
|
+ }
|
|
+
|
|
if (err)
|
|
return 1;
|
|
|
|
--
|
|
2.25.0
|
|
|