Attachment 10788 Details for Bug 11117 – patch from master for 4.2 and 4.1

[patch] patch from master for 4.2 and 4.1

glustermanpage.patch (text/plain), 5.95 KB, created by Guenther Deschner on 2015-02-25 16:53:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2015-02-25 16:53:25 UTC

Size: 5.95 KB

patch

obsolete

>From e377caa76d0d746ef0bc73f81fae8068cdd1a2de Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Fri, 13 Feb 2015 01:03:21 +0100
>Subject: [PATCH 1/3] doc:man:vfs_glusterfs: remove extra % signs.
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Guenther Deschner <gd@samba.org>
>(cherry picked from commit b9bf3c4d785606573ee3b9cb8e727bb04b3be6fb)
>---
> docs-xml/manpages/vfs_glusterfs.8.xml | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
>diff --git a/docs-xml/manpages/vfs_glusterfs.8.xml b/docs-xml/manpages/vfs_glusterfs.8.xml
>index 83032cc..363ee74 100644
>--- a/docs-xml/manpages/vfs_glusterfs.8.xml
>+++ b/docs-xml/manpages/vfs_glusterfs.8.xml
>@@ -82,12 +82,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>
>-- 
>2.1.0
>
>
>From 1ab742281d7b54ccd6d37f40dffd58a907604731 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Fri, 13 Feb 2015 01:04:11 +0100
>Subject: [PATCH 2/3] doc:man:vfs_glusterfs: improve and update description.
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Guenther Deschner <gd@samba.org>
>(cherry picked from commit 7852dd9e4c806d4e2b5428cb783b8ce6db8902d0)
>---
> docs-xml/manpages/vfs_glusterfs.8.xml | 33 +++++++++++++++++----------------
> 1 file changed, 17 insertions(+), 16 deletions(-)
>
>diff --git a/docs-xml/manpages/vfs_glusterfs.8.xml b/docs-xml/manpages/vfs_glusterfs.8.xml
>index 363ee74..f569201 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>
> 
>-- 
>2.1.0
>
>
>From ff520a1de133f941afda0de0a2ff44531e731915 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Thu, 19 Feb 2015 16:59:00 +0100
>Subject: [PATCH 3/3] doc:man:vfs_glusterfs: improve the configuration section.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Guenther Deschner <gd@samba.org>
>
>Autobuild-User(master): GÃ¼nther Deschner <gd@samba.org>
>Autobuild-Date(master): Fri Feb 20 14:29:21 CET 2015 on sn-devel-104
>
>(cherry picked from commit e6e6f563e6968dcb3ae558a7857f8dff49d2939f)
>---
> docs-xml/manpages/vfs_glusterfs.8.xml | 23 +++++++++++++++++++++--
> 1 file changed, 21 insertions(+), 2 deletions(-)
>
>diff --git a/docs-xml/manpages/vfs_glusterfs.8.xml b/docs-xml/manpages/vfs_glusterfs.8.xml
>index f569201..c0c320c 100644
>--- a/docs-xml/manpages/vfs_glusterfs.8.xml
>+++ b/docs-xml/manpages/vfs_glusterfs.8.xml
>@@ -62,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>
>-- 
>2.1.0
>

Flags:

obnox: review+

Actions: View

Attachments on bug 11117: 10788