Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zpios' into linux-zpios

This commit is contained in:
Brian Behlendorf 2008-12-15 10:31:35 -08:00
parent 185b8b2e20 e631cff898
commit 6bea798e15
6 changed files with 13 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
README
View File

@ -32,31 +32,10 @@
make
make check <as root>
============================ ZFS LUSTRE BUILD ============================
1) Build the SPL (Solaris Porting Layer) module which is designed to
provide many Solaris APIs in the Linux kernel which are needed
by ZFS. To build the SPL:
tar -xzf spl-x.y.z.tgz
cd spl-x.y.z
./configure --with-linux=<kernel src>
make
make check <as root>
2) Build ZFS, this port is based on build 89 of ZFS from OpenSolaris.
To build ZFS as a userspace library for use by a Lustre filesystem:
tar -xzf zfs-x.y.z.tgz
cd zfs-x.y.z
./configure --zfsconfig=lustre \
--with-linux=<kernel src> \
--with-spl=<spl src>
make
make check <as root>
============================ ZPIOS TEST SUITE ============================
3) Provided is an in-kernel test application called zpios which can be
used to simulate a Lustre IO load. It may be used as a stress test
used to simulate a parallel IO load. It may be used as a stress test
or as a performance to measure your configuration. To simplify testing
there are scripts provided in the scripts/ directory. A single test
can be run as follows:

2
config/Makefile.am
View File

@ -1 +1 @@
EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 lustre.m4 user.m4 Rules.am
EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 user.m4 Rules.am

4
config/lustre.m4
View File

@ -1,4 +0,0 @@
dnl #
dnl # Default ZFS lustre configuration
dnl #
AC_DEFUN([ZFS_AC_CONFIG_LUSTRE], [])

9
config/zfs-build.m4
View File

@ -238,7 +238,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [
AC_ARG_WITH([zfs-config],
AS_HELP_STRING([--with-config=CONFIG],
[Config file 'kernel|user|lustre']),
[Config file 'kernel|user|all']),
[zfsconfig="$withval"])
AC_MSG_CHECKING([zfs config])
@ -246,12 +246,13 @@ AC_DEFUN([ZFS_AC_CONFIG], [
case "$zfsconfig" in
kernel) ZFS_AC_CONFIG_KERNEL ;;
user) ZFS_AC_CONFIG_USER ;;
lustre) ZFS_AC_CONFIG_LUSTRE ;;
user) ZFS_AC_CONFIG_USER ;;
all) ZFS_AC_CONFIG_KERNEL
ZFS_AC_CONFIG_USER ;;
*)
AC_MSG_RESULT([Error!])
AC_MSG_ERROR([Bad value "$zfsconfig" for --with-config,
user kernel|user|lustre]) ;;
user kernel|user|all]) ;;
esac
ZFS_AC_CONFIG_SCRIPT

14
configure.ac
View File

@ -43,7 +43,7 @@ AC_PROG_INSTALL
AC_PROG_CC
AC_PROG_LIBTOOL
zfsconfig=kernel
zfsconfig=all
kernelsrc=
kernelbuild=
splsrc=
@ -68,18 +68,6 @@ AC_CHECK_LIB([share], [sa_init],
[AC_DEFINE([HAVE_LIBSHARE], 1,
[Define to 1 if 'libshare' library available])])
AC_EGREP_HEADER(ioctl, unistd.h,
[AC_DEFINE([HAVE_IOCTL_IN_UNISTD_H], 1,
[Define to 1 if ioctl() is defined in <unistd.h> header file])])
AC_EGREP_HEADER(ioctl, sys/ioctl.h,
[AC_DEFINE([HAVE_IOCTL_IN_SYS_IOCTL_H], 1,
[Define to 1 if ioctl() is defined in <sys/ioctl.h> header file])])
AC_EGREP_HEADER(ioctl, stropts.h,
[AC_DEFINE([HAVE_IOCTL_IN_STROPTS_H], 1,
[Define to 1 if ioctl() is defined in <stropts.h> header file])])
AC_EGREP_HEADER(strcmp, strings.h,
[AC_DEFINE([HAVE_STRCMP_IN_STRINGS_H], 1,
[Define to 1 if strcmpl() is defined in <strings.h> header file])])

8
scripts/create-zpool.sh
View File

@ -27,13 +27,13 @@ prog=create-zpool.sh
DEVICES=""
echo
echo "zpool create lustre <devices>"
${CMDDIR}/zpool/zpool create -F lustre ${DEVICES}
echo "zpool create zpios <devices>"
${CMDDIR}/zpool/zpool create -F zpios ${DEVICES}
echo
echo "zpool list"
${CMDDIR}/zpool/zpool list
echo
echo "zpool status lustre"
${CMDDIR}/zpool/zpool status lustre
echo "zpool status zpios"
${CMDDIR}/zpool/zpool status zpios