summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Kwolek <adam.kwolek@intel.com>2011-01-06 19:17:29 +1100
committerNeilBrown <neilb@suse.de>2011-01-06 19:17:29 +1100
commit57f8c76946f0b445433f045d6cf522df45590be5 (patch)
tree03a2c8e24a19e908a59924eb4e18f374dd5fb02c
parented08d51c1a923c07d99a9d33357817afeff95238 (diff)
Detect level change
For level migration support it is necessary to allow mdmon to react for level changes. It has to have ability to change configuration of active array, and for array level change to raid0 finish array monitoring. Signed-off-by: Maciej Trela <maciej.trela@intel.com> Signed-off-by: Adam Kwolek <adam.kwolek@intel.com> Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--managemon.c12
-rw-r--r--monitor.c2
2 files changed, 13 insertions, 1 deletions
diff --git a/managemon.c b/managemon.c
index 9cb80499..269d06ed 100644
--- a/managemon.c
+++ b/managemon.c
@@ -448,6 +448,18 @@ static void manage_member(struct mdstat_ent *mdstat,
else
frozen = 1; /* can't read metadata_version assume the worst */
+ if (mdstat->level) {
+ int level = map_name(pers, mdstat->level);
+ if (a->info.array.level != level && level >= 0) {
+ struct active_array *newa = duplicate_aa(a);
+ if (newa) {
+ newa->info.array.level = level;
+ replace_array(a->container, a, newa);
+ a = newa;
+ }
+ }
+ }
+
if (a->check_degraded && !frozen) {
struct metadata_update *updates = NULL;
struct mdinfo *newdev = NULL;
diff --git a/monitor.c b/monitor.c
index 3962d9e9..4efe5da7 100644
--- a/monitor.c
+++ b/monitor.c
@@ -506,7 +506,7 @@ static int wait_and_act(struct supertype *container, int nowait)
/* once an array has been deactivated we want to
* ask the manager to discard it.
*/
- if (!a->container) {
+ if (!a->container || (a->info.array.level == 0)) {
if (discard_this) {
ap = &(*ap)->next;
continue;