Commit Graph

2656 Commits

Author SHA1 Message Date
Brian Behlendorf 6367f93602 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-21 12:04:18 -07:00
Brian Behlendorf aec988734b Command 'zpool create' needs to wait on correct partition names.
When creating partition tables we always need to wait until not
only the /dev/<disk><part> device appears.  But just as importantly
if we were originally given a udev path we need to wait for the
/dev/disk/*/<name>-part<part> symlink to be created.  However,
since the partition naming convention differs between /dev/ and
/dev/disk we determine based on the path which convention to
expect and then wait (for a few seconds) for the device to be
created.  Based on my experience with udev on my test nodes it
takes about 300ms for the devices to be created after being
prompted by the kernel.  This time will vary somehwat based
on how complicated your udev rules are, so for safety I threw
in a factor of 10.  We wait 3 seconds for the devices to appears
before erroring out with a failure.

An additional minor fix includes checking the force flag in the
EFI_GPT_PRIMARY_CORRUPT case.  This allows you to force the
update even in the corrupt partition case.

Finally, since these are Linux only changes I've dropped the
devid code entirely here because I still can't think of why we
would need or want it on a Linux system.
2009-10-21 11:50:42 -07:00
Brian Behlendorf 5bf14d3400 Update zpool-configs to be udev aware.
To simplify creation and management of test configurations the
dragon and x4550 configureis have been integrated with udev.  Our
current best guess as to how we'll actually manage the disks in
these systems is with a udev mapping scheme.  The current leading
scheme is to map each drive to a simpe <CHANNEL><RANK> id.  In
this mapping each CHANNEL is represented by the letters a-z, and
the RANK is represented by the numbers 1-n.  A CHANNEL should
identify a group of RANKS which are all attached to a single
controller, each RANK represents a disk.  This provides a nice
mechanism to locate a specific drive given a known hardware
configuration.  Various hardware vendors use a similar scheme.

A nice side effect of these changes is it allowed me to make
the raid0/raid10/raidz/raidz2 setup functions generic.  This
makes adding new test configs easy, you just need to create
a udev rules file for your test config which conforms to the
naming scheme.
2009-10-21 11:38:51 -07:00
Brian Behlendorf 5be28776fb Always preserve the passed path at creation time so udev may be used
After spending considerable time thinking about this I've come to the
conclusion that on Linux systems we don't need Solaris style devid
support.  Instead was can simply use udev if we are careful, there
are even some advantages.

The Solaris style devid's are designed to provide a mechanism by which
a device can be opened reliably regardless of it's location in the system.
This is exactly what udev provides us on Linux, a flexible mechanism for
consistently identifing the same devices regardless of probing order.
We just need to be careful to always open the device by the path provided
at creation time, this path must be stored in ZPOOL_CONFIG_PATH.  This
in fact has certain advantages.

For example, if in your system you always want the zpool to be able to
locate the disk regardless of physical location you can create the pool
using /dev/disk/by-id/.  This is perhaps what you'ld want on a desktop
system where the exact location is not that important.  It's more
critical that all the disks can be found.

However, in an enterprise setup there's a good chace that the physical
location of each drive is important.  You have like set things up such
that your raid groups span multiple hosts adapters, such that you can
lose an adapter without downtime.  In this case you would want to use
the /dev/disk/by-path/ path to ensure the path information is preserved
and you always open the disks at the right physical locations.  This
would ensure your system never gets accidently misconfigured and still
just works because the zpool was still able to locate the disk.

Finally, if you want to get really fancy you can always create your
own udev rules.  This way you could implement whatever lookup sceme
you wanted in user space for your drives.  This would include nice
cosmetic things like being able to control the device names in tools
like zpool status, since the name as just based of the device names.

I've yet to come up with a good reason to implement devid support on
Linux since we have udev.  But I've still just commented it out for now
because somebody might come up with a really good I forgot.
2009-10-19 13:46:48 -07:00
Brian Behlendorf 58d6f53677 Minor bug wholedisk is only valid for VDEV_DISK types. 2009-10-16 10:41:40 -07:00
Brian Behlendorf 3d24809465 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-15 16:45:11 -07:00
Brian Behlendorf 48d1b0c5ab Cleanly integrate ZFS tools with libblkid.
The majority of this this patch concerns itself with doing a direct
replacement of Solaris's libdiskmgt library with libblkid+libefi.
You'll notice that this patch removes all libdiskmgt code instead of
ifdef'ing it out.  This was done to minimize any confusion when reading
the code because it seems unlikely we will ever port libdiskmgt to Linux.

Despite the replacement the behavior of the tools should have remained
the same with one exception.  For the moment, we are unable to check
the partitions of devices which have an MBR style partition table when
creating a filesystem.  If a non-efi partition sceme is detected on a
whole disk device we prompt the user to explicity use the force option.
It would not be a ton of work to make the tool aware of MBR style
partitions if this becomes a problem.

I've done basic sanity checking for various configurations and all
the issues I'm aware of have been addressed.  Even things like blkid
misidentifing a disk as ext3 when it is added to a zfs pool.  I'm
careful to always zero out the first 4k of any new zfs partition.  That
all said this is all new code and while it looks like it's working right
for me we should keep an eye on it for any strange behavior.
2009-10-15 16:28:47 -07:00
Brian Behlendorf a09d33e929 Update build system for libblkid integration 2009-10-15 16:25:18 -07:00
Brian Behlendorf 992be351d5 Changes required to integrate libefi in to Linux.
The major change here is to fix up libefi to be linux aware.  For
the most part this wasn't too hard but there were a few major issues.

First off I needed to handle the DKIOCGMEDIAINFO and DKIOCINFO ioctls.
There is no direct equivilant for these ioctls under linux.  To handle
this I added wrapper functions which under Solaris simple call the ioctls.
But under Linux dig around the system a little bit getting the needed
info to fill in the requested structures.

Secondly the efi_ioctl() call was adapted such that under linux it directly
read or writes out the partition table.  Under Solaris this work was
handed off to the kernel via an ioctl.  In the efi_write() case we also
ensure we prompt the kernel via BLKRRPART to re-scan the new partition
table.  The libefi generated partition tables are correct but older
versions of ~parted-1.8.1 can not read them without a small patch.
The kernel and fdisk are able to read them just fine.

Thirdly efi_alloc_and_init() which is used by zpool to determine if a
device is a 'wholedisk' was updated to be linux aware.  This check is
performed by using the partition number for the device, which the
partition number is 0 on linux it is a 'wholedisk'.  However, certain
device type such as the loopback and ram disks needed to be excluded
because they do not support partitioning.

Forthly the zpool command was made symlink aware so it can correctly
resolve udev entries such as /dev/disk/by-*/*.  This symlinks are
fully expanded ensuring all block devices are recognized.  When a
when a 'wholedisk' block device is detected we now properly write
out an efi label and place zfs in the first partition (0th slice).
This partition is created 1MiB in to the disk to ensure it is aligned
nicely with all high end block devices I'm aware of.

This all works for me now but it did take quite a bit of work to get
it all sorted out.  It would not surprise me if certain special cases
were missed so we should keep any eye of for any odd behavior.
2009-10-14 16:07:48 -07:00
Brian Behlendorf 245e7692f7 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-14 15:58:55 -07:00
Brian Behlendorf 085ed9fe82 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-10-14 15:57:10 -07:00
Brian Behlendorf cb678c0b31 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-10-14 15:57:09 -07:00
Brian Behlendorf 9ea3f53d0c Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-10-14 15:57:09 -07:00
Brian Behlendorf a8adb61c00 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-10-14 15:57:08 -07:00
Brian Behlendorf 09a8c99097 Additional build system update for libefi library.
This include updating all the Makefile.am to have the correct
include paths and libraries.  In addition, the zlib m4 macro was
updated to more correctly integrate with the Makefiles.  And I
added two new macros libblkid and libuuid which will be needed by
subsequent commits for blkid and uuid support respectively.  The
blkid support is optional, the uuid support is mandatory for libefi.
2009-10-14 15:47:41 -07:00
Brian Behlendorf 39d85a8b94 Remove pragmas from new libefi files. 2009-10-14 15:44:22 -07:00
Brian Behlendorf 81ec3f8951 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-09 16:43:53 -07:00
Brian Behlendorf cb91bbe6ce Additional set of build system tweaks for libefi library. 2009-10-09 16:37:32 -07:00
Brian Behlendorf 7c073d0a7d Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-09 16:09:54 -07:00
Brian Behlendorf a0337cfcd8 Add libefi library in to the build system. 2009-10-09 15:58:45 -07:00
Brian Behlendorf 503c5eeb2d Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-09 15:45:22 -07:00
Brian Behlendorf e0e0f0ea84 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-10-09 15:43:33 -07:00
Brian Behlendorf 2b2fd27e18 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-10-09 15:43:32 -07:00
Brian Behlendorf ad0f8481d2 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-10-09 15:43:31 -07:00
Brian Behlendorf b60766e22f Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-10-09 15:43:31 -07:00
Brian Behlendorf 7698515ec4 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-10-09 15:43:30 -07:00
Brian Behlendorf 6df047f11f Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2009-10-09 15:43:30 -07:00
Brian Behlendorf 46fa16ed8c Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-10-09 15:43:28 -07:00
Brian Behlendorf 656d8f6b22 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-10-09 15:43:28 -07:00
Brian Behlendorf 46b272f2c4 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-10-09 15:43:25 -07:00
Brian Behlendorf 1b7a8f5e26 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-10-09 15:43:24 -07:00
Brian Behlendorf a4c68aa767 Merge branch 'fix-acl' into refs/top-bases/fix-branch 2009-10-09 15:43:23 -07:00
Brian Behlendorf 873470861e Merge commit 'refs/top-bases/fix-acl' into fix-acl 2009-10-09 15:43:23 -07:00
Brian Behlendorf 27c7573a5e Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2009-10-09 15:43:22 -07:00
Brian Behlendorf 6d3da13a7d Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode 2009-10-09 15:43:21 -07:00
Brian Behlendorf 00699175eb Merge branch 'fix-strncat' into refs/top-bases/fix-branch 2009-10-09 15:43:20 -07:00
Brian Behlendorf 69d396e7e0 Merge commit 'refs/top-bases/fix-strncat' into fix-strncat 2009-10-09 15:43:20 -07:00
Brian Behlendorf 3b18b22fb3 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-10-09 15:43:18 -07:00
Brian Behlendorf 38a311ac31 Merge commit 'refs/top-bases/fix-list' into fix-list 2009-10-09 15:43:18 -07:00
Brian Behlendorf ed89c3baec Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2009-10-09 15:43:17 -07:00
Brian Behlendorf d7d86be950 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-10-09 15:43:16 -07:00
Brian Behlendorf dbdf553198 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2009-10-09 15:43:15 -07:00
Brian Behlendorf e59c225cea Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-10-09 15:43:15 -07:00
Brian Behlendorf 3d7d195f48 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-10-09 15:43:13 -07:00
Brian Behlendorf 49529232e1 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-10-09 15:43:13 -07:00
Brian Behlendorf 1719b6ee81 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2009-10-09 15:43:12 -07:00
Brian Behlendorf dd666623a4 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2009-10-09 15:43:11 -07:00
Brian Behlendorf 1d88115083 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2009-10-09 15:43:10 -07:00
Brian Behlendorf fb2c44bdfc Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2009-10-09 15:43:10 -07:00
Brian Behlendorf 8dc9c727ad Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2009-10-09 15:43:08 -07:00