The branch, master has been updated
via e6e6f56 doc:man:vfs_glusterfs: improve the configuration section.
via 7852dd9 doc:man:vfs_glusterfs: improve and update description.
via b9bf3c4 doc:man:vfs_glusterfs: remove extra % signs.
from 75dff77 s4: smbtorture: leases - show stat opens grant leases and
can be broken.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e6e6f563e6968dcb3ae558a7857f8dff49d2939f
Author: Michael Adam <[email protected]>
Date: Thu Feb 19 16:59:00 2015 +0100
doc:man:vfs_glusterfs: improve the configuration section.
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
Autobuild-User(master): Günther Deschner <[email protected]>
Autobuild-Date(master): Fri Feb 20 14:29:21 CET 2015 on sn-devel-104
commit 7852dd9e4c806d4e2b5428cb783b8ce6db8902d0
Author: Michael Adam <[email protected]>
Date: Fri Feb 13 01:04:11 2015 +0100
doc:man:vfs_glusterfs: improve and update description.
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit b9bf3c4d785606573ee3b9cb8e727bb04b3be6fb
Author: Michael Adam <[email protected]>
Date: Fri Feb 13 01:03:21 2015 +0100
doc:man:vfs_glusterfs: remove extra % signs.
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/vfs_glusterfs.8.xml | 61 +++++++++++++++++++++++------------
1 file changed, 40 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/vfs_glusterfs.8.xml
b/docs-xml/manpages/vfs_glusterfs.8.xml
index 83032cc..c0c320c 100644
--- a/docs-xml/manpages/vfs_glusterfs.8.xml
+++ b/docs-xml/manpages/vfs_glusterfs.8.xml
@@ -32,28 +32,29 @@
<manvolnum>8</manvolnum></citerefentry> suite.</para>
<para>
- The <command>vfs_glusterfs</command> VFS module exposes
- GlusterFS specific features for use by Samba.
+ GlusterFS
+ (<ulink
url="http://www.gluster.org/";>http://www.gluster.org</ulink>)
+ is an Open Source clustered file system capable of scaling to
+ several peta-bytes. With its FUSE based native client,
+ GlusterFS is available as a POSIX compliant file system and can
+ hence be shared by Samba without additional steps.
</para>
<para>
- GlusterFS is a clustered file system, capable of scaling
- to several peta-bytes. It aggregates various storage bricks
- over Infiniband RDMA or TCP/IP and interconnect into one large
- parallel network file system. Storage bricks can be made of any
- commodity hardware, such as x86-64 server with SATA-II RAID and
- Infiniband HBA.
-
- GlusterFS is fully POSIX compliant file system. It supports
- standard clients running standard applications over any standard
- IP network and also FUSE. It works seemlessly on
- different operating systems, currently supported on GNU/Linux
- and Solaris.
+ The <command>vfs_glusterfs</command> VFS module provides an
+ alternative, and superior way to access a Gluster filesystem
+ from Samba for sharing. It does not require a Gluster FUSE mount
+ but directly accesses the GlusterFS daemon through its library
+ <command>libgfapi</command>, thereby omitting the expensive
+ kernel-userspace context switches and taking advantage of some
+ of the more advanced features of GlusterFS.
</para>
<para>
- This module is stackable, provided glusterfs lies in the bottom
- of the stack.
+ This module can be combined with other modules, but it
+ should be the last module in the <command>vfs objects</command>
+ list. Modules added to this list to the right of the glusterfs
+ entry may not have any effect at all.
</para>
</refsect1>
@@ -61,14 +62,33 @@
<title>CONFIGURATION</title>
<para>
- <command>vfs_glusterfs</command> requires that the underlying
share
- path is a Gluster filesystem.
+ A basic configuration looks like this.
</para>
<programlisting>
<smbconfsection name="[share]"/>
<smbconfoption name="vfs objects">glusterfs</smbconfoption>
+ <smbconfoption name="path">/relative/base/path</smbconfoption>
+ <smbconfoption name="glusterfs:volume">gv0</smbconfoption>
+ <smbconfoption name="kernel share modes">no</smbconfoption>
</programlisting>
+
+ <para>
+ Note that since <command>vfs_glusterfs</command> does not
+ require a Gluster mount, the share <command>path</command> is
+ treated differently than for other shares: It is interpreted as
+ the base path of the share relative to the gluster volume used.
+ Because this is usually not at the same time a system path, in a
+ ctdb cluster setup where ctdb manages Samba, you need to set
+ <command>CTDB_SAMBA_SKIP_SHARE_CHECK=yes</command> in ctdb's
+ configuration file. Otherwise ctdb will not get healthy.
+ </para>
+
+ <para>
+ Note that currently kernel share modes have to be disabled
+ in a share running with the glusterfs vfs module for file
+ serving to work properly.
+ </para>
</refsect1>
<refsect1>
@@ -82,12 +102,11 @@
<para>
Defines whether and where to store a vfs_glusterfs
specific
logfile. Client variable substitution is supported (i.e.
- %M, %m, %I), hence per client log file can be
- %specified.
+ %M, %m, %I), hence per client log file can be specified.
</para>
<para>
Example: glusterfs:logfile =
- %/var/log/samba/glusterfs-vol2.%M.log
+ /var/log/samba/glusterfs-vol2.%M.log
</para>
</listitem>
</varlistentry>
--
Samba Shared Repository
