Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
ffcb9ba45b
25
README
25
README
|
@ -32,31 +32,10 @@
|
||||||
make
|
make
|
||||||
make check <as root>
|
make check <as root>
|
||||||
|
|
||||||
============================ ZFS LUSTRE BUILD ============================
|
============================ ZPIOS TEST SUITE ============================
|
||||||
|
|
||||||
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>
|
|
||||||
|
|
||||||
3) Provided is an in-kernel test application called zpios which can be
|
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
|
or as a performance to measure your configuration. To simplify testing
|
||||||
there are scripts provided in the scripts/ directory. A single test
|
there are scripts provided in the scripts/ directory. A single test
|
||||||
can be run as follows:
|
can be run as follows:
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
dnl #
|
|
||||||
dnl # Default ZFS lustre configuration
|
|
||||||
dnl #
|
|
||||||
AC_DEFUN([ZFS_AC_CONFIG_LUSTRE], [])
|
|
|
@ -238,7 +238,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [
|
||||||
|
|
||||||
AC_ARG_WITH([zfs-config],
|
AC_ARG_WITH([zfs-config],
|
||||||
AS_HELP_STRING([--with-config=CONFIG],
|
AS_HELP_STRING([--with-config=CONFIG],
|
||||||
[Config file 'kernel|user|lustre']),
|
[Config file 'kernel|user|all']),
|
||||||
[zfsconfig="$withval"])
|
[zfsconfig="$withval"])
|
||||||
|
|
||||||
AC_MSG_CHECKING([zfs config])
|
AC_MSG_CHECKING([zfs config])
|
||||||
|
@ -247,11 +247,12 @@ AC_DEFUN([ZFS_AC_CONFIG], [
|
||||||
case "$zfsconfig" in
|
case "$zfsconfig" in
|
||||||
kernel) ZFS_AC_CONFIG_KERNEL ;;
|
kernel) ZFS_AC_CONFIG_KERNEL ;;
|
||||||
user) ZFS_AC_CONFIG_USER ;;
|
user) ZFS_AC_CONFIG_USER ;;
|
||||||
lustre) ZFS_AC_CONFIG_LUSTRE ;;
|
all) ZFS_AC_CONFIG_KERNEL
|
||||||
|
ZFS_AC_CONFIG_USER ;;
|
||||||
*)
|
*)
|
||||||
AC_MSG_RESULT([Error!])
|
AC_MSG_RESULT([Error!])
|
||||||
AC_MSG_ERROR([Bad value "$zfsconfig" for --with-config,
|
AC_MSG_ERROR([Bad value "$zfsconfig" for --with-config,
|
||||||
user kernel|user|lustre]) ;;
|
user kernel|user|all]) ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
ZFS_AC_CONFIG_SCRIPT
|
ZFS_AC_CONFIG_SCRIPT
|
||||||
|
|
14
configure.ac
14
configure.ac
|
@ -43,7 +43,7 @@ AC_PROG_INSTALL
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AC_PROG_LIBTOOL
|
AC_PROG_LIBTOOL
|
||||||
|
|
||||||
zfsconfig=kernel
|
zfsconfig=all
|
||||||
kernelsrc=
|
kernelsrc=
|
||||||
kernelbuild=
|
kernelbuild=
|
||||||
splsrc=
|
splsrc=
|
||||||
|
@ -68,18 +68,6 @@ AC_CHECK_LIB([share], [sa_init],
|
||||||
[AC_DEFINE([HAVE_LIBSHARE], 1,
|
[AC_DEFINE([HAVE_LIBSHARE], 1,
|
||||||
[Define to 1 if 'libshare' library available])])
|
[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_EGREP_HEADER(strcmp, strings.h,
|
||||||
[AC_DEFINE([HAVE_STRCMP_IN_STRINGS_H], 1,
|
[AC_DEFINE([HAVE_STRCMP_IN_STRINGS_H], 1,
|
||||||
[Define to 1 if strcmpl() is defined in <strings.h> header file])])
|
[Define to 1 if strcmpl() is defined in <strings.h> header file])])
|
||||||
|
|
|
@ -27,13 +27,13 @@ prog=create-zpool.sh
|
||||||
DEVICES=""
|
DEVICES=""
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "zpool create lustre <devices>"
|
echo "zpool create zpios <devices>"
|
||||||
${CMDDIR}/zpool/zpool create -F lustre ${DEVICES}
|
${CMDDIR}/zpool/zpool create -F zpios ${DEVICES}
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "zpool list"
|
echo "zpool list"
|
||||||
${CMDDIR}/zpool/zpool list
|
${CMDDIR}/zpool/zpool list
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "zpool status lustre"
|
echo "zpool status zpios"
|
||||||
${CMDDIR}/zpool/zpool status lustre
|
${CMDDIR}/zpool/zpool status zpios
|
||||||
|
|
Loading…
Reference in New Issue