Merge branch 'master' into devel-3.2

[thirdparty/mdadm.git] / managemon.c

diff --git a/managemon.c b/managemon.c
index 15b6e692efcbcf78a54afc9708db5d528ba742b6..d6c57f78bd28a038d92dcad390272a79fbd82429 100644 (file)
--- a/managemon.c
+++ b/managemon.c
@@ -465,7 +465,12 @@ static void manage_member(struct mdstat_ent *mdstat,
                }
        }
 
-       if (a->check_degraded && !frozen) {
+       /* We don't check the array while any update is pending, as it
+        * might container a change (such as a spare assignment) which
+        * could affect our decisions.
+        */
+       if (a->check_degraded && !frozen &&
+           update_queue == NULL && update_queue_pending == NULL) {
                struct metadata_update *updates = NULL;
                struct mdinfo *newdev = NULL;
                struct active_array *newa;