[SCM] Samba Shared Repository - branch v4-1-test updated
Karolin Seeger
kseeger at samba.org
Wed Feb 25 14:16:03 MST 2015
The branch, v4-1-test has been updated
via 3bc159d doc:man:vfs_glusterfs: improve the configuration section.
via daf5852 doc:man:vfs_glusterfs: improve and update description.
via 0fa83fe doc:man:vfs_glusterfs: remove extra % signs.
via 630db2f debug: Set close-on-exec for the main log file FD
from dd89495 VERSION: Bump version up to 4.1.18.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-1-test
- Log -----------------------------------------------------------------
commit 3bc159dcef1b83be1d191309d25924e2d7df919d
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 19 16:59:00 2015 +0100
doc:man:vfs_glusterfs: improve the configuration section.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
Autobuild-User(master): Günther Deschner <gd at samba.org>
Autobuild-Date(master): Fri Feb 20 14:29:21 CET 2015 on sn-devel-104
(cherry picked from commit e6e6f563e6968dcb3ae558a7857f8dff49d2939f)
The last 3 patches address
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11117
vfs_glusterfs manpage corrections
Autobuild-User(v4-1-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-1-test): Wed Feb 25 22:15:39 CET 2015 on sn-devel-104
commit daf585247b9397f772911a005468f734d71ef28c
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 13 01:04:11 2015 +0100
doc:man:vfs_glusterfs: improve and update description.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
(cherry picked from commit 7852dd9e4c806d4e2b5428cb783b8ce6db8902d0)
commit 0fa83fec5a781d16ef88f37a20a9fe02a23f4ddb
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 13 01:03:21 2015 +0100
doc:man:vfs_glusterfs: remove extra % signs.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
(cherry picked from commit b9bf3c4d785606573ee3b9cb8e727bb04b3be6fb)
commit 630db2f10c3f97620de821f2c55805d34cef7c1f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Feb 16 15:59:11 2015 +1300
debug: Set close-on-exec for the main log file FD
This does not change the properties of dup2() of the fd as STDERR, however this is closed
before we start smbd or winbindd as child processes.
This is needed otherwise the logfile remains open in the child process, and
logfile rotation can mean this old log remains on disk indefinatly.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11100
Pair-programmed-with: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Mon Feb 16 11:42:47 CET 2015 on sn-devel-104
(based on commit 1d95b0afc3547a91f8558873ce58652c271ed9eb)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/vfs_glusterfs.8.xml | 61 +++++++++++++++++++++++------------
lib/util/debug.c | 3 ++
2 files changed, 43 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>
diff --git a/lib/util/debug.c b/lib/util/debug.c
index a46b275..cf42d36 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -596,6 +596,7 @@ bool reopen_logs_internal(void)
log_overflow = false;
ret = false;
} else {
+ smb_set_close_on_exec(new_fd);
old_fd = state.fd;
state.fd = new_fd;
debug_close_fd(old_fd);
@@ -729,6 +730,7 @@ void check_log_size( void )
*/
int fd = open( "/dev/console", O_WRONLY, 0);
if (fd != -1) {
+ smb_set_close_on_exec(fd);
state.fd = fd;
DEBUG(0,("check_log_size: open of debug file %s failed - using console.\n",
state.debugf ));
@@ -791,6 +793,7 @@ void check_log_size( void )
errno = old_errno;
goto done;
}
+ smb_set_close_on_exec(fd);
state.fd = fd;
}
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list