Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

monitor: ensure we retry soon when 'remove' fails. 

If a 'remove' fails there is no certainty that another event will
happen soon, so make sure we retry soon anyway.

Reported-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2012-01-03 00:36:23 +11:00
parent 77b3ac8c65
commit 68226a8081
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mdadm.h
View File

@ -867,6 +867,7 @@ struct supertype {
* external:/md0/12 * external:/md0/12
*/ */
int devcnt; int devcnt;
int retry_soon;
struct mdinfo *devs; struct mdinfo *devs;

16
monitor.c
View File

@ -212,6 +212,7 @@ static void signal_manager(void)
*/ */
#define ARRAY_DIRTY 1 #define ARRAY_DIRTY 1
#define ARRAY_BUSY 2
static int read_and_act(struct active_array *a) static int read_and_act(struct active_array *a)
{ {
unsigned long long sync_completed; unsigned long long sync_completed;
@ -419,9 +420,9 @@ static int read_and_act(struct active_array *a)
if ((mdi->next_state & DS_REMOVE) && mdi->state_fd >= 0) { if ((mdi->next_state & DS_REMOVE) && mdi->state_fd >= 0) {
int remove_result; int remove_result;
/* the kernel may not be able to immediately remove the /* The kernel may not be able to immediately remove the
* disk, we can simply wait until the next event to try * disk. In that case we wait a little while and
* again. * try again.
*/ */
remove_result = write_attr("remove", mdi->state_fd); remove_result = write_attr("remove", mdi->state_fd);
if (remove_result > 0) { if (remove_result > 0) {
@ -429,7 +430,8 @@ static int read_and_act(struct active_array *a)
close(mdi->state_fd); close(mdi->state_fd);
close(mdi->recovery_fd); close(mdi->recovery_fd);
mdi->state_fd = -1; mdi->state_fd = -1;
} } else
ret |= ARRAY_BUSY;
} }
if (mdi->next_state & DS_INSYNC) { if (mdi->next_state & DS_INSYNC) {
write_attr("+in_sync", mdi->state_fd); write_attr("+in_sync", mdi->state_fd);
@ -597,7 +599,7 @@ static int wait_and_act(struct supertype *container, int nowait)
struct timespec ts; struct timespec ts;
ts.tv_sec = 24*3600; ts.tv_sec = 24*3600;
ts.tv_nsec = 0; ts.tv_nsec = 0;
if (*aap == NULL) { if (*aap == NULL || container->retry_soon) {
/* just waiting to get O_EXCL access */ /* just waiting to get O_EXCL access */
ts.tv_sec = 0; ts.tv_sec = 0;
ts.tv_nsec = 20000000ULL; ts.tv_nsec = 20000000ULL;
@ -612,7 +614,7 @@ static int wait_and_act(struct supertype *container, int nowait)
#ifdef DEBUG #ifdef DEBUG
dprint_wake_reasons(&rfds); dprint_wake_reasons(&rfds);
#endif #endif
container->retry_soon = 0;
} }
if (update_queue) { if (update_queue) {
@ -653,6 +655,8 @@ static int wait_and_act(struct supertype *container, int nowait)
*/ */
if (sigterm && !(ret & ARRAY_DIRTY)) if (sigterm && !(ret & ARRAY_DIRTY))
a->container = NULL; /* stop touching this array */ a->container = NULL; /* stop touching this array */
if (ret & ARRAY_BUSY)
container->retry_soon = 1;
} }
} }