]> git.ipfire.org Git - thirdparty/mdadm.git/log
thirdparty/mdadm.git
13 years agoMerge branch 'master' into devel-3.2
NeilBrown [Thu, 9 Dec 2010 00:16:42 +0000 (11:16 +1100)] 
Merge branch 'master' into devel-3.2

Conflicts:
mdadm.8.in

Same conceptual change was written with different words in each version.
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agofix: mdstat_read() incorrectly translates value of mdstat_ent->reshape for recovering
Hawrylewicz Czarnowski, Przemyslaw [Wed, 8 Dec 2010 11:30:28 +0000 (11:30 +0000)] 
fix: mdstat_read() incorrectly translates value of mdstat_ent->reshape for recovering

it results in wrong output of mdadm --detail (shows reshaping instead
of recovering)

Signed-off-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agofix: mdadm -Ss for external metadata don't stop container
Hawrylewicz Czarnowski, Przemyslaw [Tue, 7 Dec 2010 06:44:21 +0000 (06:44 +0000)] 
fix: mdadm -Ss for external metadata don't stop container

Sometimes (~50%) mdadm -Ss cannot stop container as mdmon opens its device
and do not close it before exit(). The period between open and release of
handle is too long and md is not able stop device. Releasing handle before
exit does not block md.

Signed-off-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agofix: incremental on invalid container causes segfault
Hawrylewicz Czarnowski, Przemyslaw [Mon, 6 Dec 2010 06:40:40 +0000 (06:40 +0000)] 
fix: incremental on invalid container causes segfault

counterpart of 417f346ee0 for incremental.
If md device has metadata_version="none" super_by_fd() matches
supertype=super0.
Call of load_container() dereferences null, so we have to forbid it.

Signed-off-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoFIX: wait_backup() sometimes hungs
Adam Kwolek [Fri, 3 Dec 2010 10:33:55 +0000 (21:33 +1100)] 
FIX: wait_backup() sometimes hungs

Sometimes wait_backup() omits transition from reshape to idle state
and mdadm seams to be hung.  So check the 'complete' count
*before* waiting rather than only after.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoFIX: Honor !reshape state on wait_reshape() entry
Adam Kwolek [Fri, 3 Dec 2010 04:10:20 +0000 (15:10 +1100)] 
FIX: Honor !reshape state on wait_reshape() entry

When wait_reshape() function starts it can occurs that reshape is
finished already, before wait_reshape() start. This can lead to wait
for change state inside this function for a long time.  To avoid this
before wait we should test if finish conditions are not reached
already.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoFIX: sync_completed_fd handler has to be closed
Adam Kwolek [Fri, 3 Dec 2010 04:07:04 +0000 (15:07 +1100)] 
FIX: sync_completed_fd handler has to be closed

sync_completed_fd handler has to be closed when array is closing.
This is in pair to open handler code.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoFIX: Do not use layout for raid4 and raid0 while geo map computing
Adam Kwolek [Fri, 3 Dec 2010 04:03:25 +0000 (15:03 +1100)] 
FIX: Do not use layout for raid4 and raid0 while geo map computing

After takeover, layout has no meaning for computing geo map for raid0
and raid4.  Set layout to 0 for such cases.  It can happen after
takeover operation when not all array information is reread.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoGrow: open backup file for reshape as function
Adam Kwolek [Fri, 3 Dec 2010 04:00:16 +0000 (15:00 +1100)] 
Grow: open backup file for reshape as function

Move opening backup file to the function for future reuse during
container reshape.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAdd support to skip slot configuration
Adam Kwolek [Thu, 2 Dec 2010 08:19:12 +0000 (09:19 +0100)] 
Add support to skip slot configuration

When disk is added, set valid slot numbers (positive) only.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoFIX: Cannot exit monitor after takeover
Adam Kwolek [Thu, 2 Dec 2010 08:18:49 +0000 (09:18 +0100)] 
FIX: Cannot exit monitor after takeover

When performing backward takeover to raid0 monitor cannot exit
for single raid0 array configuration.
Monitor is locked by communication (ping_manager()) after unfreeze()

Do not ping manager for raid0 array as they shouldn't be monitored.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: don't add more spares than needed
Anna Czarnowska [Fri, 3 Dec 2010 03:11:29 +0000 (14:11 +1100)] 
Monitor: don't add more spares than needed

When we add a spare to a container it takes a while
before it is noticed by mdmon and recovery starts.
During this time the array remains degraded but we don't want to add
any more spares to this container. Therefore we must check container
with degraded array if it doesn't already have a suitable spare.
container_choose_spare is reused with from=to
Domain check is not needed in this situation.

Ping_manager after moving disk is needed to be able to see
newly added disk in container after coming back through the loop.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: only get min_size once
Anna Czarnowska [Fri, 3 Dec 2010 03:05:11 +0000 (14:05 +1100)] 
Monitor: only get min_size once

We may call chose_spare several times before we find a suitable one
so it is better to get the size beforehand.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: pass statelist reference when adding new arrays
Anna Czarnowska [Tue, 30 Nov 2010 12:44:45 +0000 (13:44 +0100)] 
Monitor: pass statelist reference when adding new arrays

Otherwise it will not get updated.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoCreate/grow: improve checks on number of devices.
NeilBrown [Wed, 1 Dec 2010 03:51:27 +0000 (14:51 +1100)] 
Create/grow: improve checks on number of devices.

Check on upper limit of number of devices was in the wrong place.
Result was could not create array with more than 27 devices without
explicitly setting metadata, even though default metadata allows more.

Fixed, and also perform check when growing an array.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoGrow: disallow placing backup file on array being reshaped.
NeilBrown [Wed, 1 Dec 2010 00:58:32 +0000 (11:58 +1100)] 
Grow: disallow placing backup file on array being reshaped.

the tests here aren't perfect, but they could catch some cases.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: allow an array undergoing reshape to be started without backup file
NeilBrown [Wed, 1 Dec 2010 00:47:32 +0000 (11:47 +1100)] 
Assemble: allow an array undergoing reshape to be started without backup file

Though not having the proper backup file can cause data corruption, it
is not enough to justify not being able to start the array at all.
So allow "--invalid-backup" to be specified which says "just continue
even if a backup cannot be restored".

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agofix: assemble for external metadata generates segfault if invalid device found
Hawrylewicz Czarnowski, Przemyslaw [Wed, 1 Dec 2010 00:06:09 +0000 (11:06 +1100)] 
fix: assemble for external metadata generates segfault if invalid device found

An attempt to invoke super_by_fd() on device that has
metadata_version="none" always matches super0 (as test_version is "").
In Assemble() it results in segfault when load_container is invoked
(=null for super0).
As of now load_container is only started if it points to valid pointer.

Signed-off-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoCreate: report failure if array cannot be started.
NeilBrown [Wed, 1 Dec 2010 00:03:28 +0000 (11:03 +1100)] 
Create: report failure if array cannot be started.

We weren't checking the result of writing 'active' to array_state

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoddf: fail creation of new subarray with same name as old.
NeilBrown [Tue, 30 Nov 2010 22:55:35 +0000 (09:55 +1100)] 
ddf: fail creation of new subarray with same name as old.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoddf: don't print warning on assemble
NeilBrown [Tue, 30 Nov 2010 22:47:21 +0000 (09:47 +1100)] 
ddf: don't print warning on assemble

Now that we check the error return of 'update_super' better, we
much make sure that ddf doesn't incorrectly report that the
superblocks are wrong during assemble.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agomdmon: don't copy an invalid chunk_size
NeilBrown [Tue, 30 Nov 2010 07:35:36 +0000 (18:35 +1100)] 
mdmon: don't copy an invalid chunk_size

As chunk_size in mdstat_ent is never set, we shouldn't copy
it into a->info.array.
In fact, it is safest to get rid of the field altogether.

Reported-by: "Kwolek, Adam" <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: call remove_partitions later.
NeilBrown [Tue, 30 Nov 2010 05:56:01 +0000 (16:56 +1100)] 
Assemble: call remove_partitions later.

We shouldn't call remove_partitions until we have made a really firm
decision to include the device into the array.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: add --update=no-bitmap
NeilBrown [Tue, 30 Nov 2010 05:46:01 +0000 (16:46 +1100)] 
Assemble: add --update=no-bitmap

This allows an array with a corrupt internal bitmap to be assembled
without the bitmap.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoGrow: give useful message when adding bitmap gives EBUSY.
NeilBrown [Tue, 30 Nov 2010 05:34:25 +0000 (16:34 +1100)] 
Grow: give useful message when adding bitmap gives EBUSY.

If adding a bitmap fails with EBUSY, then it is because the array is
currently resyncing/recovering/reshaping.
As this is non-obvious, give a message explaining the fact.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoFix warning about host-endian bitmaps.
NeilBrown [Tue, 30 Nov 2010 05:25:26 +0000 (16:25 +1100)] 
Fix warning about host-endian bitmaps.

Hostendian bitmaps should be warned about on all arch's.
And fix a speeling mistake.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAllow K,M,G suffix on chunk sizes as well as device/array sizes.
NeilBrown [Tue, 30 Nov 2010 05:23:02 +0000 (16:23 +1100)] 
Allow K,M,G suffix on chunk sizes as well as device/array sizes.

We already allow K,M,G suffixes for --size and --array-size.
Allow it for --chunk and --bitmap-chunk as well.

Also add this info to man page, and remove the duplication of info
about --array-size.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoCompute backup blocks in function.
Adam Kwolek [Tue, 30 Nov 2010 02:30:22 +0000 (13:30 +1100)] 
Compute backup blocks in function.

number of backup blocks evaluation is put in to function for code reuse.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoPrepare and free fdlist in functions
Adam Kwolek [Tue, 30 Nov 2010 02:27:08 +0000 (13:27 +1100)] 
Prepare and free fdlist in functions

fd handles table creation is put in to function for code reuse.

In manage_reshape(), child_grow() function from Grow.c will be reused.
To prepare parameters for this function, code from Grow.c can be
reused also.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoimsm: Allow multiple spares to be collected.
Adam Kwolek [Fri, 26 Nov 2010 07:08:01 +0000 (08:08 +0100)] 
imsm: Allow multiple spares to be collected.

Assumption for spares searching was that after picking new device, it
has to be added to array before next search.  This causes returning
different disk on each call.

When creating a spare list during Online Capacity Expansion, we will
first collect the devices list and then all devices are added to md.
Picked device from spares pool has to be checked against picked
devices so far. If not, the same disk will be returned all the time.
Already picked devices are stored in the list and this list is used
for new devices verification also.

So add an extra arg to imsm_add_spare to hold a list of known
spares to ignore.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoimsm: FIX: core dump during imsm metadata writing
Adam Kwolek [Mon, 29 Nov 2010 01:53:16 +0000 (12:53 +1100)] 
imsm: FIX: core dump during imsm metadata writing

Wrong number of disks during metadata update causes core dump.  New
disks number based on internal mdmon information has to used for
calculation (not previously read from metadata).

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoimsm: Add support for general migration
Adam Kwolek [Mon, 29 Nov 2010 01:28:01 +0000 (12:28 +1100)] 
imsm: Add support for general migration

Internal IMSM procedures need to support the General Migration.
It is used during operations like:
- Online Capacity Expansion,
- migration initialization,
- finishing migration,
- apply changes to raid disks etc.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoTreat feature as experimental
Adam Kwolek [Mon, 29 Nov 2010 01:11:09 +0000 (12:11 +1100)] 
Treat feature as experimental

Due to fact that IMSM Windows compatibility was not tested yet,
feature has to be treated as experimental until compatibility
verification will be performed.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoDisk removal support for Raid10->Raid0 takeover
Adam Kwolek [Mon, 29 Nov 2010 00:57:51 +0000 (11:57 +1100)] 
Disk removal support for Raid10->Raid0 takeover

Until now Raid10->Raid0 takeover was possible only if all the mirrors
where removed before md starts the takeover.  Now mdadm, when
performing Raid10->raid0 takeover, will remove all unwanted mirrors
from the array before actual md takeover is called.

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>
13 years agoImprove comments for block_monitor.
NeilBrown [Sun, 28 Nov 2010 23:32:15 +0000 (10:32 +1100)] 
Improve comments for block_monitor.

Also not that the leading '-' on the metadata names now
simply means that mdmon must not reconfiure the array.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: array that has disappeared doesn't need spares
Anna Czarnowska [Fri, 26 Nov 2010 13:31:15 +0000 (14:31 +0100)] 
Monitor: array that has disappeared doesn't need spares

If a degraded array disappears we still have it in statelist
with active<raid but it is pointless to look for spares for it.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: fix writing autorebuild.pid
Anna Czarnowska [Fri, 26 Nov 2010 13:29:53 +0000 (14:29 +0100)] 
Monitor: fix writing autorebuild.pid

If /var/run/mdadm doesn't exist we can never succeed writing
so we should try to create it first. When we make sure it is there we
write pid file as before.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: reset dev when size too small
Anna Czarnowska [Fri, 26 Nov 2010 10:51:59 +0000 (11:51 +0100)] 
Monitor: reset dev when size too small

Cc: linux-raid@vger.kernel.org, Williams, Dan J <dan.j.williams@intel.com>, Ciechanowski, Ed <ed.ciechanowski@intel.com>
Otherwise spare will be considered good anyway.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: devid should be dev_t
Anna Czarnowska [Fri, 26 Nov 2010 10:49:33 +0000 (11:49 +0100)] 
Monitor: devid should be dev_t

For consistency with makedev().
int is not sufficient.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: few bug fixes for spare migration
Anna Czarnowska [Sun, 28 Nov 2010 22:51:27 +0000 (09:51 +1100)] 
Monitor: few bug fixes for spare migration

1. If array not changed we should still report any degraded
    - another array may have a new spare that we can move.
2. Array with err=1 can't give a spare.
3. We look for spares in "from" not "st" which is supertype
   and has devname=NULL.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoSpare migration tests
Anna Czarnowska [Sun, 28 Nov 2010 22:43:29 +0000 (09:43 +1100)] 
Spare migration tests

This is a series of tests checking if mdadm Monitor migrates spares
according to rules in /etc/mdadm.conf defined by POLICY lines.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: Marcin Labun <marcin.labun@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoIncremental - avoid including wayward devices.
NeilBrown [Sun, 28 Nov 2010 22:40:15 +0000 (09:40 +1100)] 
Incremental - avoid including wayward devices.

If a devices - typically in a mirrored set - is assembled
independently of the other devices, and then attempted to be brought
back into the set, it could contain inconsistent data.  It should not
be included.

So detect this situation by ensuring that the 'most recent' device is
believed to be active by every other device.  If a device is wayward,
it will only consider fellow wayward devices to be active and will
think all others are failed or missing.

This patches fixes --incremental, --assemble was done in an earlier
patch.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoImprove opt parsing, and distinguish long from short.
NeilBrown [Thu, 25 Nov 2010 07:58:45 +0000 (18:58 +1100)] 
Improve opt parsing, and distinguish long from short.

In several cases, two different long options map to the same short
option.  So e.g. you could give '--brief' and it would be interpreted
as '--bitmap'.  That isn't really good.

So for every shared short option, define an option number and return
that for the long option instead.  Then always check for both the
short and long options.

Also give some bugs like " mode == 'G'" which should be '== GROW'.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoIncr: reduce the number of times we load data from sysfs.
NeilBrown [Thu, 25 Nov 2010 07:58:44 +0000 (18:58 +1100)] 
Incr: reduce the number of times we load data from sysfs.

Rather than calling sysfs_read whenever we want data from sysfs, call
it once at the start will all the requests of interest, then just use
that,

Make sure we free it properly too.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: choose spare correctly for external metadata.
NeilBrown [Thu, 25 Nov 2010 07:58:27 +0000 (18:58 +1100)] 
Monitor: choose spare correctly for external metadata.

When metadata is managed externally - probably as a container - we
need to examine that metadata to see which devices are spares.

So use the getinfo_super_disk message and use the info returned.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: separate 'choose_spare' out from 'move_spare'
NeilBrown [Thu, 25 Nov 2010 07:37:23 +0000 (18:37 +1100)] 
Monitor: separate 'choose_spare' out from 'move_spare'

choosing a spare from a container is more complicated that
from a native array.  So separate out choose_spare to make it easier
to use an alternate implementation

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoExternal reshape (step 2): Freeze container
Dan Williams [Tue, 23 Nov 2010 05:39:58 +0000 (16:39 +1100)] 
External reshape (step 2): Freeze container

When growing the number of raid disks the reshape process will promote
container-spares to subarray-spares (later the kernel promotes them to
subarray-members in raid5_start_reshape()).  The automatic spare
promotion that mdmon performs upon seeing a degraded array must be
disabled until the reshape process has been initiated.  Otherwise, mdmon
may start a rebuild before the reshape parameters can be specified.

In the external case we arrange for the monitor to be blocked, and
turn off the safemode delay.
Mdmon is updated to check sync_action is not frozen before initiating
recovery.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoExternal reshape (step 1): container reshape and ->reshape_super()
Dan Williams [Thu, 18 Nov 2010 09:22:59 +0000 (10:22 +0100)] 
External reshape (step 1): container reshape and ->reshape_super()

In the native metadata case Grow_reshape() and the kernel validate what
reshapes are possible / supported and the kernel handles all the metadata
updates.  In the external case the metadata format may have specific
constraints above this baseline.  External formats also introduce the
constraint of only permitting some reshapes at container scope versus subarray
scope.  For exmaple imsm changes to 'raiddisks' must be applied to all arrays
in the container.

This operation assumes that its 'st' parameter has been obtained from
super_by_fd() (such that st->subarray is up to date), and that a snapshot of
the metadata has been loaded from the container.

Why a new method, versus extending an existing one?
->validate_geometry: this routine assumes it is being called from Create(),
adding reshape complicates the cases that this routine needs to handle.  Where
we find that checks can be shared between the two cases those routines
refactored into common code internal to the metadata handler, i.e. no need to
provide a unified external interface.  ->validate_geometry() also does not
expect to update the metadata.

->update_super: this is meant to update single fields at Assembly() and only at
the container scope.  Reshape potentially wants to update multiple fields at
either container or subarray scope.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoDocument the external reshape implementation
Dan Williams [Tue, 23 Nov 2010 04:53:00 +0000 (15:53 +1100)] 
Document the external reshape implementation

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoInitialize st->devnum and st->container_dev in super_by_fd
Dan Williams [Tue, 23 Nov 2010 04:31:18 +0000 (15:31 +1100)] 
Initialize st->devnum and st->container_dev in super_by_fd

Precludes needing to deduce this information later, like in Detail.c and
soon in Grow.c.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoCreate: cleanup/unify default geometry handling
Dan Williams [Thu, 18 Nov 2010 09:22:33 +0000 (10:22 +0100)] 
Create: cleanup/unify default geometry handling

Support metadata specific level, layout and chunksize defaults.  Kill an
uneeded superswitch methods ahead of adding more for the reshape case.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agofix a get_linux_version() comparison typo
Dan Williams [Thu, 18 Nov 2010 09:22:25 +0000 (10:22 +0100)] 
fix a get_linux_version() comparison typo

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoGrow: fix check for raid6 layout normalization
Dan Williams [Thu, 18 Nov 2010 09:22:09 +0000 (10:22 +0100)] 
Grow: fix check for raid6 layout normalization

If the user does not specify a layout, don't skip asking about retaining
the non-standard raid6 layout which may be implicitly changed.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: fix assembly in the delta_disks > max_degraded case
Dan Williams [Thu, 18 Nov 2010 09:22:01 +0000 (10:22 +0100)] 
Assemble: fix assembly in the delta_disks > max_degraded case

Incremental assembly works on such an array because the kernel sees the
disk as in-sync and that the array is reshaping.  Teach Assemble() the
same assumptions.

This is only needed on kernels that do not initialize ->recovery_offset
when activating spares for reshape.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoGrow: mark some functions static
Dan Williams [Thu, 18 Nov 2010 09:21:53 +0000 (10:21 +0100)] 
Grow: mark some functions static

Going through the Grow api found some local routines that could be
marked static.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoManage: allow manual control of external raid0 readonly flag
Dan Williams [Tue, 23 Nov 2010 04:08:19 +0000 (15:08 +1100)] 
Manage: allow manual control of external raid0 readonly flag

mdadm --readwrite <subarray> will clear the external readonly flag ('-'
to '/'), but only for redudant arrays.  Allow raid0 arrays as well so
the user has a simple helper to control this flag.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoblock monitor: freeze spare assignment for external arrays
Dan Williams [Tue, 23 Nov 2010 04:00:54 +0000 (15:00 +1100)] 
block monitor: freeze spare assignment for external arrays

In order to support reshape and atomic removal of spares from containers
we need to prevent mdmon from activating spares.  In the reshape case we
additionally need to freeze sync_action while the reshape transaction is
initiated with the kernel and recorded in the metadata.

When reshaping a raid0 array we need to freeze the array *before* it is
transitioned to a redundant raid level.  Since sync_action does not exist
at this point we extend the '-' prefix of a subarray string to flag
mdmon not to activate spares.

Mdadm needs to be reasonably certain that the version of mdmon in the
system honors this 'freeze' indication.  If mdmon is not already active
then we assume the version that gets started is the same as the mdadm
version.  Otherwise, we check the version of mdmon as returned by the
extended ping_monitor() operation.  This is to catch cases where mdadm
is upgraded in the filesystem, but mdmon started in the initramfs is
from a previous release.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoProvide a mdstat_ent to subarray helper
Dan Williams [Thu, 18 Nov 2010 09:21:29 +0000 (10:21 +0100)] 
Provide a mdstat_ent to subarray helper

...before introducing another open coded instace of this conversion.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: get content before testing it.
NeilBrown [Tue, 23 Nov 2010 00:34:36 +0000 (11:34 +1100)] 
Assemble: get content before testing it.

When checking that a container matches the required uuid,
we need to call 'getinfo_super' before we have a 'content'
to test.

Reported-by: "Czarnowska, Anna" <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: check spare group is non-NULL before adding to domain list
NeilBrown [Tue, 23 Nov 2010 00:11:45 +0000 (11:11 +1100)] 
Monitor: check spare group is non-NULL before adding to domain list

... otherwise we crash.

Reported-by: "Labun, Marcin" <Marcin.Labun@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoPolicy is aware of metadata disk's controller domains.
Marcin Labun [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Policy is aware of metadata disk's controller domains.

Platform (metadata) domain let the metadata handlers differentiate
disk domains based on controllers that the disk belongs to.
Platform domain is sub-domain inside user specified domain
in mdadm.conf configuration files inheriting all parameters from it.
The metadata domain name is used disk domain matching functions.
The disk with the same metadata domain name belong to the same metadata
domain.

New metadata handler is added that retrieves platform domain string based
on disk path:
const char *(*get_disk_controller_domain)(const char *path);

Signed-off-by: Marcin Labun <marcin.labun@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: Allow metadata to set minimum size for spare to migrate in.
Anna Czarnowska [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Monitor: Allow metadata to set minimum size for spare to migrate in.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: teach spare migration about containers
NeilBrown [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Monitor: teach spare migration about containers

When trying to move a spare, move to the container of a degraded
array, not to the array itself.
And don't try to move from a subarray, only from a native or container
array.
And don't move from a container which contains degraded subarrays.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: policy based spare migration.
NeilBrown [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Monitor: policy based spare migration.

Rather than only migrating between arrays with the same spare_group,
we now migrate based on domains set in the policy.

In order for spare_group to continue to work, we treat it as a domain
of the destination array, and a domain of any device we might remove
from a source array.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: split out check_donor
NeilBrown [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Monitor: split out check_donor

Checking compatibility between arrays for spare migration is going to
become a little more complicated, so split it out into a separate
function.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: split out move_spare in spare migration.
NeilBrown [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Monitor: split out move_spare in spare migration.

This is a simple refactoring with no functionality change.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonior: create struct for holding alert info.
NeilBrown [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Monior: create struct for holding alert info.

Rather than passing mailaddr, mailfrom, cmd, dosyslog around in
argument lists, create a structure to hold them all.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: use calloc rather than malloc
NeilBrown [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Monitor: use calloc rather than malloc

calloc zeros the memory allocated, which is safer, particularly as
we add more things to struct state.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: minor optimisation to spare migration.
NeilBrown [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Monitor: minor optimisation to spare migration.

Only try spare migration if we know that at least one array is
degraded.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoimsm: create mdinfo list of disks in a container from supertype
Anna Czarnowska [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
imsm: create mdinfo list of disks in a container from supertype

If getinfo_super is called on a container supertype we only get information
on first disk. As a parameter it uses reference to preallocated
mdinfo structure. Amending getinfo_super to return full list of disks
would require ammending all previous calls and subsequently freeing memory
allocated for mdinfo list.
Function container_content that returns a mdinfo list is written
specifically for assembly, performing actions not needed to just fill
mdinfo. It also does not include spares so is unsuitable.
As an alternative a new function getinfo_super_disks is created
to obtain information about all disks states in array.
Existing function sysfs_free is used to free memory
allocated by getinfo_super_disks.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: Marcin Labun <marcin.labun@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: link containers with subarrays in statelist
Marcin Labun [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Monitor: link containers with subarrays in statelist

Each containers has list of its subarrays. Each subarray
has back link to its parent container.

Signed-off-by: Marcin Labun <marcin.labun@intel.com>
Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoBreak Monitor into smaller functions.
NeilBrown [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Break Monitor into smaller functions.

Monitor() has become way too big.  Break it up into multiple smaller
functions that are all called from the main loop.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: track metadata type or parent/container of arrays.
NeilBrown [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Monitor: track metadata type or parent/container of arrays.

For subarrays, record the devid of the parent.
For others arrays, record the metadata type.

This will be used in a subsequent patch to link related arrays
together and allow spare migration between containers.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: include containers in scan mode
Anna Czarnowska [Mon, 22 Nov 2010 09:58:07 +0000 (20:58 +1100)] 
Monitor: include containers in scan mode

Signed-off-by: Marcin Labun <marcin.labun@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: avoid skipping checks on external arrays
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Monitor: avoid skipping checks on external arrays

utime is not correct for external metadata so we must
not risk the observed time ever matching the old time.

Reported-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agomdadm: added --no-sharing option for Monitor mode
Anna Czarnowska [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
mdadm: added --no-sharing option for Monitor mode

--no-sharing option disables moving spares between arrays/containers.
Without the option spares are moved if needed according to config rules.
We only allow one process moving spares started with --scan option.
If there is such process running and another instance of Monitor
is starting without --scan, then we issue a warning but allow it
to continue.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoMonitor: set err on arrays not in mdstat
Anna Czarnowska [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Monitor: set err on arrays not in mdstat

mse can be NULL when the array was not in mdstat when we read it
but existed in statelist and was recreated after reading mdstat.
In this case we set err as we can't get full update on this array
this time.
If the same array is given twice in command line it appears twice
in statelist. The first one will mark mse->devnum=INT_MAX
so the second one can't find mse. We set err on the second one as
it's not needed. Also if it becomes degraded we would look for spares
twice for the same array.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoUtil: get device size from id
Anna Czarnowska [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Util: get device size from id

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAdd action=spare-same-slot policy.
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Add action=spare-same-slot policy.

When "mdadm -I" is given a device with no metadata, mdadm tries to add
it as a 'spare' somewhere based on policy.

This patch changes the behaviour in two ways:

1/ If the device is at a 'path' where a previous device was removed
  from an array or container, then we preferentially add the spare to
  that array or container.

2/ Previously only 'bare' devices were considered for adding as
  spares.  Now if action=spare-same-slot is active, we will add
  non-bare devices, but *only* if the path was previously in use
  for some array, and the device will only be added to that array.

Based on code
  From: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>

Signed-off-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoincr/spare: recheck allowed action for each metadata.
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
incr/spare: recheck allowed action for each metadata.

The current act_spare tests only test if it is allowed for some
metadata.
As we check each array or partitioning type, we need to double-check
that sparing is allowed for that array or partitioning type.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoIncr/spare: make sure failure to identify metadata if handled gracefully.
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Incr/spare: make sure failure to identify metadata if handled gracefully.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoIncr: fix up return value in try_spare
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Incr: fix up return value in try_spare

We only want to try partition_try_spare if array_try_spare failed.
If it succeeded, there is nothing more to try.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoFactor out is_bare test.
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Factor out is_bare test.

Instead of open coding (and using horrible gotos), make this
a separate function.

Also fix the check for end of device - SEEK_END doesn't work on
block devices.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoextension of IncrementalRemove to store location (path-id) of removed device
Przemyslaw Czarnowski [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
extension of IncrementalRemove to store location (path-id) of removed device

If the disk is taken out from its port this port information is
lost. Only udev rule can provide us with this information, and then we
have to store it somehow. This patch adds writing 'cookie' file in
/dev/.mdadm/failed-slots directory in form of file named with value of
f<path-id> containing the metadata type and uuid of the array (or
container) that the device was a member of.  The uuid is in exactly
the same format as in the mapfile.

FAILED_SLOTS_DIR constant has been added to hold the location of
cookie files.

Signed-off-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoTeach IncrementalRemove about containers.
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Teach IncrementalRemove about containers.

When we -I -R a device in a container, we must first fail it
from each member array before we can remove it from the container.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoUpdate of udev rules to support IMSM devices
Przemyslaw Czarnowski [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Update of udev rules to support IMSM devices

ID_FS_TYPE for IMSM members is set to isw_raid_member, so they must also
be handled in udev.

Signed-off-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoadded --path <path_id> to give the information on the 'path-id' of removed device
Przemyslaw Czarnowski [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
added --path <path_id> to give the information on the 'path-id' of removed device

<path-id> allows to identify the port to which given device is plugged
in.  In case of hot-removal, udev can pass this information for future
use (eg. write this name as 'cookie' allowing to detect the fact of
reinserting device to the same port).

--path <path-id> parameter has been added to device removal handle
(and char *path has been added to IncrementalRemove() to pass this
value) in order to pass path-id to this handler.

Signed-off-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoRemove loaded_container
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Remove loaded_container

This field is now only set, never used.

So remove it.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoimsm: always calculate container_enough in getinfo_super_imsm
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
imsm: always calculate container_enough in getinfo_super_imsm

We are about to lose the loaded_container field, and we don't really
need to use it to protect the calculation of container_enough.
So drop the test.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoReplace various load_super calls with load_container
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Replace various load_super calls with load_container

When we call load_super expecting to find a container, we now
just call load_container directly.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: use load_container
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Assemble: use load_container

Separate the load_container call from the load_super call,
and use different validity tests as appropriate.

Add some general code tidying and a bit of indent change to make
structure a little clearer.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAdd must_be_container helper.
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Add must_be_container helper.

This checks a block device to see if it could be a container, and
in particular cannot be a member device.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: turn next_member goto loop into a for loop.
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Assemble: turn next_member goto loop into a for loop.

It becomes much clearer what is happening now.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: simplify the handling of is_member_busy.
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Assemble: simplify the handling of is_member_busy.

This is somewhat inconsistent with the last member of a
container getting special handling.
Just simplify it so the code seems to make sense and important
is easy to follow.

Signed-of-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: remove the skip variable.
NeilBrown [Mon, 22 Nov 2010 09:58:06 +0000 (20:58 +1100)] 
Assemble: remove the skip variable.

it seems we don't need it any more

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: merge 'member' test into ident_matches.
NeilBrown [Mon, 22 Nov 2010 09:58:05 +0000 (20:58 +1100)] 
Assemble: merge 'member' test into ident_matches.

This is a more sensible place for it, gathering all the tests
together.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: change 'skip' label to a variable.
NeilBrown [Mon, 22 Nov 2010 09:58:05 +0000 (20:58 +1100)] 
Assemble: change 'skip' label to a variable.

This gets rid of some gotos which makes the code flow a bit
more clear.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoRemove content from mddev_dev
NeilBrown [Mon, 22 Nov 2010 09:58:05 +0000 (20:58 +1100)] 
Remove content from mddev_dev

Now that the next_member loop is much smaller it is easy to
just use 'content' rather than stashing it in 'tmpdev->content'.
So we can remove the 'content' field from 'struct mddev_dev'.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: contract next_member loop.
NeilBrown [Mon, 22 Nov 2010 09:58:05 +0000 (20:58 +1100)] 
Assemble: contract next_member loop.

We have a 'goto next_member' loop which is rather spread-out and
confusing.
Recent refactoring make it possible to contract that loop
significantly.

Signed-off-by: NeilBrown <neilb@suse.de>
13 years agoAssemble: merge to large 'if' statements.
NeilBrown [Mon, 22 Nov 2010 09:58:05 +0000 (20:58 +1100)] 
Assemble: merge to large 'if' statements.

In assemble, we see (inside a 'for' loop):

 if (condition) {
    lots of stuff
 } else
    something

 small thing

 if (same condition) {
     lots more stuff
     break;
 }

where 'condition' cannot be changed in the middle.

So simplify this to

 if (condition) {
    lots of stuff
    small thing
    lots more stuff
    break;
 }

 something
 small thing

which duplicates the small thing, but provides much
conceptual simplicity.

Signed-off-by: NeilBrown <neilb@suse.de>