From: Xiao Ni <xni@redhat.com>
To: mariusz.tkaczyk@linux.intel.com
Cc: linux-raid@vger.kernel.org, ncroxon@redhat.com
Subject: [PATCH V2 2/2] mdadm/Grow: Update reshape_progress to need_back after reshape finishes
Date: Wed, 11 Sep 2024 16:54:24 +0800 [thread overview]
Message-ID: <20240911085432.37828-3-xni@redhat.com> (raw)
In-Reply-To: <20240911085432.37828-1-xni@redhat.com>
It tries to update data offset when kicking off reshape. If it can't
change data offset, it needs to use child_monitor to monitor reshape
progress and do back up job. And it needs to update reshape_progress
to need_back when reshape finishes. If not, it will be in a infinite
loop.
Signed-off-by: Xiao Ni <xni@redhat.com>
---
v2: add empty line after declaration
Grow.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/Grow.c b/Grow.c
index 533f301468af..3b9f994200aa 100644
--- a/Grow.c
+++ b/Grow.c
@@ -4148,8 +4148,8 @@ int progress_reshape(struct mdinfo *info, struct reshape *reshape,
* waiting forever on a dead array
*/
char action[SYSFS_MAX_BUF_SIZE];
- if (sysfs_get_str(info, NULL, "sync_action", action, sizeof(action)) <= 0 ||
- strncmp(action, "reshape", 7) != 0)
+
+ if (sysfs_get_str(info, NULL, "sync_action", action, sizeof(action)) <= 0)
break;
/* Some kernels reset 'sync_completed' to zero
* before setting 'sync_action' to 'idle'.
@@ -4157,12 +4157,18 @@ int progress_reshape(struct mdinfo *info, struct reshape *reshape,
*/
if (completed == 0 && advancing &&
strncmp(action, "idle", 4) == 0 &&
- info->reshape_progress > 0)
+ info->reshape_progress > 0) {
+ info->reshape_progress = need_backup;
break;
+ }
if (completed == 0 && !advancing &&
strncmp(action, "idle", 4) == 0 &&
info->reshape_progress <
- (info->component_size * reshape->after.data_disks))
+ (info->component_size * reshape->after.data_disks)) {
+ info->reshape_progress = need_backup;
+ break;
+ }
+ if (strncmp(action, "reshape", 7) != 0)
break;
sysfs_wait(fd, NULL);
if (sysfs_fd_get_ll(fd, &completed) < 0)
--
2.32.0 (Apple Git-132)
next prev parent reply other threads:[~2024-09-11 8:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-11 8:54 [PATCH 00/10] mdadm tests fix Xiao Ni
2024-09-11 8:54 ` [PATCH V2 1/1] mdadm/Grow: Update new level when starting reshape Xiao Ni
2024-09-25 7:51 ` Mariusz Tkaczyk
2024-09-25 12:57 ` Xiao Ni
2024-09-11 8:54 ` Xiao Ni [this message]
2024-09-11 8:54 ` [PATCH 03/10] mdadm/Grow: Can't open raid when running --grow --continue Xiao Ni
2024-09-11 8:54 ` [PATCH v2 4/4] mdadm/Grow: sleep a while after removing disk in impose_level Xiao Ni
2024-09-11 8:54 ` [PATCH 05/10] mdadm/tests: wait until level changes Xiao Ni
2024-09-11 8:54 ` [PATCH 06/10] mdadm/tests: 07changelevels fix Xiao Ni
2024-09-11 8:54 ` [PATCH 07/10] mdadm/tests: Remove 07reshape5intr.broken Xiao Ni
2024-09-11 8:54 ` [PATCH 08/10] mdadm/tests: 07testreshape5 fix Xiao Ni
2024-09-11 8:54 ` [PATCH 09/10] mdadm/tests: remove 09imsm-assemble.broken Xiao Ni
2024-09-23 9:08 ` Mariusz Tkaczyk
2024-09-11 8:54 ` [PATCH 10/10] mdadm/Manage: record errno Xiao Ni
2024-09-23 8:51 ` [PATCH 00/10] mdadm tests fix Mariusz Tkaczyk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240911085432.37828-3-xni@redhat.com \
--to=xni@redhat.com \
--cc=linux-raid@vger.kernel.org \
--cc=mariusz.tkaczyk@linux.intel.com \
--cc=ncroxon@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).