File Grow-fix-problems-with-prematurely-aborting-of-... of Package mdadm

Overview Repositories Revisions Requests Users Attributes Meta

File Grow-fix-problems-with-prematurely-aborting-of-resha.patch of Package mdadm (Revision 405478a0dbb5aeec0380b0a37396e7fc)

Currently displaying revision 405478a0dbb5aeec0380b0a37396e7fc , Show latest

From 5e7be8389446a4afa016351e65d1ead31a978f16 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 20 Jan 2014 15:31:45 +1100
Subject: [PATCH 09/13] Grow: fix problems with prematurely aborting of
 reshapes.

1/ when unfreezing, make sure the array is frozen first.
   If it isn't we might end up interrupting a reshape.
2/ When the child finishes, don't call abort_reshape() as that
   will interrupt the reshape.  Just set suspend_* etc
   explicitly.

Signed-off-by: NeilBrown <neilb@suse.de>
---
 Grow.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

--- mdadm-3.3.orig/Grow.c
+++ mdadm-3.3/Grow.c
@@ -612,9 +612,14 @@ static void unfreeze(struct supertype *s
 		return unfreeze_container(st);
 	else {
 		struct mdinfo *sra = sysfs_read(-1, st->devnm, GET_VERSION);
+		char buf[20];
 
-		if (sra)
+		if (sra &&
+		    sysfs_get_str(sra, NULL, "sync_action", buf, 20) > 0
+		    && strcmp(buf, "frozen\n") == 0) {
+			printf("unfreeze\n");
 			sysfs_set_str(sra, NULL, "sync_action", "idle");
+		}
 		sysfs_free(sra);
 	}
 }
@@ -2666,7 +2671,7 @@ static int impose_level(int fd, int leve
 		for (d = 0, found = 0;
 		     d < MAX_DISKS && found < array.nr_disks;
 		     d++) {
-				mdu_disk_info_t disk;
+			mdu_disk_info_t disk;
 			disk.number = d;
 			if (ioctl(fd, GET_DISK_INFO, &disk) < 0)
 				continue;
@@ -4316,7 +4321,12 @@ int child_monitor(int afd, struct mdinfo
 	}
 
 	/* FIXME maybe call progress_reshape one more time instead */
-	abort_reshape(sra); /* remove any remaining suspension */
+	/* remove any remaining suspension */
+	sysfs_set_num(sra, NULL, "suspend_lo", 0x7FFFFFFFFFFFFFFFULL);
+	sysfs_set_num(sra, NULL, "suspend_hi", 0);
+	sysfs_set_num(sra, NULL, "suspend_lo", 0);
+	sysfs_set_num(sra, NULL, "sync_min", 0);
+
 	if (reshape->before.data_disks == reshape->after.data_disks)
 		sysfs_set_num(sra, NULL, "sync_speed_min", speed);
 	free(buf);

Places

File Grow-fix-problems-with-prematurely-aborting-of-resha.patch of Package mdadm (Revision 405478a0dbb5aeec0380b0a37396e7fc)

Places