diff options
| author | Labun, Marcin <Marcin.Labun@intel.com> | 2011-10-31 11:29:46 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-10-31 11:29:46 +1100 |
| commit | 81219e70f2a9be7292046860ea15528fe5854cab (patch) | |
| tree | 6e964755844055702ee3e40385df3853dac9b3cb /Assemble.c | |
| parent | db7fdfe422a7d280b1fae999cb72b20b0e58756c (diff) | |
kill-subarray: fix, IMSM cannot kill-subarray with unsupported metadata
container_content retrieves volume information from disks in the
container. For unsupported volumes the function was not returning
mdinfo. When all volumes were unsupported the function was returning
NULL pointer to block actions on the volumes. Therefore, such volumes
were not activated in Incremental and Assembly. As side effect they
also could not be deleted using kill-subarray since "kill" function
requires to obtain a valid mdinfo from container_content.
This patch fixes the kill-subarray problem by allowing to obtain
mdinfo of all volumes types including unsupported and introducing new
array.status flags.
There are following changes:
1. Added MD_SB_BLOCK_VOLUME for blocking an array, other arrays in the
container can be activated.
2. Added MD_SB_BLOCK_CONTAINER_RESHAPE block container wide reshapes
(like changing disk numbers in arrays).
3. IMSM container_content handler is to load mdinfo for all volumes
and set both blocking flags in array.state field in mdinfo of
unsupported volumes. In case of some errors, all volumes can be
affected. Only blocked array is not activated (also reshaped as
result). The container wide reshapes are also blocked since by
metadata definition they require modifications of both arrays.
4. Incremental_container and Assemble functions check array.state and
do not activate volumes with blocking bits set.
5. assemble_container_content is changed to check container wide reshapes
before activating reshapes of assembled containers.
6. Grow_reshape and Grow_continue_command checks blocking bits
before starting reshapes or continueing (-G --continue) reshapes.
7. kill-subarray ignores array.state info and can remove requested array.
Signed-off-by: Marcin Labun <marcin.labun@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'Assemble.c')
| -rw-r--r-- | Assemble.c | 21 |
1 files changed, 13 insertions, 8 deletions
@@ -439,13 +439,6 @@ int Assemble(struct supertype *st, char *mddev, content; content = content->next) { - /* do not assemble arrays that might have bad blocks */ - if (content->array.state & (1<<MD_SB_BBM_ERRORS)) { - fprintf(stderr, Name ": BBM log found in metadata. " - "Cannot activate array(s).\n"); - tmpdev->used = 2; - goto loop; - } if (!ident_matches(ident, content, tst, homehost, update, report_missmatch ? devname : NULL)) @@ -455,6 +448,11 @@ int Assemble(struct supertype *st, char *mddev, fprintf(stderr, Name ": member %s in %s is already assembled\n", content->text_version, devname); + } else if (content->array.state & (1<<MD_SB_BLOCK_VOLUME)) { + /* do not assemble arrays with unsupported configurations */ + fprintf(stderr, Name ": Cannot activate member %s in %s.\n", + content->text_version, + devname); } else break; } @@ -1557,8 +1555,15 @@ int assemble_container_content(struct supertype *st, int mdfd, (working + preexist + expansion) >= content->array.working_disks) { int err; + int start_reshape; - if (content->reshape_active) { + /* There are two types of reshape: container wide or sub-array specific + * Check if metadata requests blocking container wide reshapes + */ + start_reshape = (content->reshape_active && + !((content->reshape_active == CONTAINER_RESHAPE) && + (content->array.state & (1<<MD_SB_BLOCK_CONTAINER_RESHAPE)))); + if (start_reshape) { int spare = content->array.raid_disks + expansion; if (restore_backup(st, content, working, |