sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-06-02 13:06:57 +03:00
Code

add systemd integration

Browse Source 
Add --with-systemd / --without-systemd options to check whether
libsystemd-daemon library is available and use it to report service
startup status to systemd for smbd/winbindd/nmbd and AD DC.

The problem it solves is correct reporting of the Samba services
at the point when they are ready to serve clients, important for
high availability software integration.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10517

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Alexander Bokovoy 2014-03-25 12:53:04 +02:00 committed by Jeremy Allison
parent 13784b74d8
commit aa8c8a7b5b
12 changed files with 97 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/util/become_daemon.c
View File

@ -24,6 +24,9 @@
#include "includes.h"
#include "system/filesys.h"
#include "system/locale.h"
#if HAVE_SYSTEMD
#include <systemd/sd-daemon.h>
#endif
/*******************************************************************
Close the low 3 fd's and open dev/null in their place.
@ -75,8 +78,13 @@ _PUBLIC_ void close_low_fds(bool stdin_too, bool stdout_too, bool stderr_too)
_PUBLIC_ void become_daemon(bool do_fork, bool no_process_group, bool log_stdout)
{
pid_t newpid;
if (do_fork) {
if (fork()) {
newpid = fork();
if (newpid) {
#if HAVE_SYSTEMD
sd_notifyf(0, "READY=0\nSTATUS=Starting process...\nMAINPID=%lu", (unsigned long) newpid);
#endif /* HAVE_SYSTEMD */
_exit(0);
}
}
@ -100,3 +108,30 @@ _PUBLIC_ void become_daemon(bool do_fork, bool no_process_group, bool log_stdout
* never close stderr (but debug might dup it onto a log file) */
close_low_fds(do_fork, !log_stdout, false);
}
_PUBLIC_ void exit_daemon(const char *msg, int error)
{
#ifdef HAVE_SYSTEMD
if (msg == NULL) {
msg = strerror(error);
}
sd_notifyf(0, "STATUS=daemon failed to start: %s\n"
"ERRNO=%i",
msg,
error);
#endif
DEBUG(0, ("STATUS=daemon failed to start: %s, error code %d\n", msg, error));
exit(1);
}
_PUBLIC_ void daemon_ready(const char *daemon)
{
if (daemon == NULL) {
daemon = "Samba";
}
#ifdef HAVE_SYSTEMD
sd_notifyf(0, "READY=1\nSTATUS=%s: ready to serve connections...", daemon);
#endif
DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve connections", daemon));
}

12
lib/util/samba_util.h
View File

@ -841,6 +841,18 @@ _PUBLIC_ void close_low_fds(bool stdin_too, bool stdout_too, bool stderr_too);
**/
_PUBLIC_ void become_daemon(bool do_fork, bool no_process_group, bool log_stdout);
/**
Exit daemon and print error message to the log at level 0
Optionally report failure to systemd if systemd integration is enabled
**/
_PUBLIC_ void exit_daemon(const char *msg, int error);
/**
Report that the daemon is ready to serve connections to the log at level 0
Optionally report status to systemd if systemd integration is enabled
**/
_PUBLIC_ void daemon_ready(const char *daemon);
/**
* @brief Get a password from the console.
*

2
lib/util/wscript_build
View File

@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('samba-util',
server_id.c dprintf.c parmlist.c bitmap.c pidfile.c
tevent_debug.c util_process.c''',
deps='DYNCONFIG',
public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid',
public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid systemd-daemon',
public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
local_include=False,

3
packaging/systemd/nmb.service
View File

@ -3,7 +3,8 @@ Description=Samba NMB Daemon
After=syslog.target network.target
[Service]
Type=forking
Type=notify
NotifyAccess=all
PIDFile=/run/nmbd.pid
EnvironmentFile=-/etc/sysconfig/samba
ExecStart=/usr/sbin/nmbd $NMBDOPTIONS

3
packaging/systemd/samba.service
View File

@ -3,7 +3,8 @@ Description=Samba AD Daemon
After=syslog.target network.target
[Service]
Type=forking
Type=notify
NotifyAccess=all
PIDFile=/run/samba.pid
LimitNOFILE=16384
EnvironmentFile=-/etc/sysconfig/samba

3
packaging/systemd/smb.service
View File

@ -3,7 +3,8 @@ Description=Samba SMB Daemon
After=syslog.target network.target nmb.service winbind.service
[Service]
Type=forking
Type=notify
NotifyAccess=all
PIDFile=/run/smbd.pid
LimitNOFILE=16384
EnvironmentFile=-/etc/sysconfig/samba

3
packaging/systemd/winbind.service
View File

@ -3,7 +3,8 @@ Description=Samba Winbind Daemon
After=syslog.target network.target nmb.service
[Service]
Type=forking
Type=notify
NotifyAccess=all
PIDFile=/run/winbindd.pid
EnvironmentFile=-/etc/sysconfig/samba
ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS"

4
source3/nmbd/nmbd.c
View File

@ -1097,6 +1097,10 @@ static bool open_sockets(bool isdaemon, int port)
exit(1);
}
if (is_daemon && !opt_interactive) {
daemon_ready("nmbd");
}
TALLOC_FREE(frame);
process(msg);

4
source3/smbd/server.c
View File

@ -1531,6 +1531,10 @@ extern void build_options(bool screen);
exit(1);
}
if (is_daemon && !interactive) {
daemon_ready("smbd");
}
/* only start other daemons if we are running as a daemon
* -- bad things will happen if smbd is launched via inetd
* and we fork a copy of ourselves here */

5
source3/winbindd/winbindd.c
View File

@ -1589,6 +1589,11 @@ int main(int argc, const char **argv)
}
TALLOC_FREE(frame);
if (!interactive) {
daemon_ready("winbindd");
}
/* Loop waiting for requests */
while (1) {
frame = talloc_stackframe();

4
source4/smbd/server.c
View File

@ -498,6 +498,10 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
return 1;
}
if (opt_daemon) {
daemon_ready("samba");
}
/* wait for events - this is where smbd sits for most of its
life */
tevent_loop_wait(event_ctx);

26
wscript
View File

@ -69,8 +69,15 @@ def set_options(opt):
help=("Disable RELRO builds"),
action="store_false", dest='enable_relro')
gr = opt.option_group('developer options')
opt.add_option('--with-systemd',
help=("Enable systemd integration"),
action='store_true', dest='enable_systemd')
opt.add_option('--without-systemd',
help=("Disable systemd integration"),
action='store_false', dest='enable_systemd')
gr = opt.option_group('developer options')
opt.tool_options('python') # options for disabling pyc or pyo compilation
# enable options related to building python extensions
@ -169,8 +176,6 @@ def configure(conf):
addmain=False,
msg='Checking configure summary'):
raise Utils.WafError('configure summary failed')
conf.SAMBA_CONFIG_H('include/config.h')
if Options.options.enable_pie != False:
if Options.options.enable_pie == True:
@ -192,6 +197,21 @@ def configure(conf):
msg="Checking compiler for full RELRO support"):
conf.env['ENABLE_RELRO'] = True
if Options.options.enable_systemd != False:
conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs',
msg='Checking for libsystemd-daemon', uselib_store="SYSTEMD-DAEMON")
conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon')
conf.CHECK_LIB('systemd-daemon', shlib=True)
if conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H'):
conf.DEFINE('HAVE_SYSTEMD', '1')
conf.env['ENABLE_SYSTEMD'] = True
else:
conf.SET_TARGET_TYPE('systemd-daemon', 'EMPTY')
conf.undefine('HAVE_SYSTEMD')
conf.SAMBA_CONFIG_H('include/config.h')
def etags(ctx):
'''build TAGS file using etags'''
import Utils