mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
6218b5f7cb
Systemd socket activation cannot handle a shutdown on the file descriptor[1]. Enumerate past the socket activation descriptors. If there was no shutdown to trigger the breaking of the event loop, then write to the termination_event_fd that was setup during the socket activation code for this purpose. As abort_loop= true is already set at the top of break_connect_loop, and this is checked in loop before sockets are processed, no additional checking to read from the termination_event_fd is needed. Without socket activation defined, or used, termination_event_fd keeps its -1 default value. Close the eventfd outside the while loop so retries can happen if the write fails for some reason. ref[1]: https://www.freedesktop.org/software/systemd/man/latest/sd_listen_fds.html Reviewed by: Vladislav Vaintroub
55 lines
2 KiB
C
55 lines
2 KiB
C
/*
|
|
Copyright (c) 2015 Daniel Black. All rights reserved.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
|
|
*/
|
|
|
|
|
|
#ifndef MY_SERVICE_MANAGER_INCLUDED
|
|
#define MY_SERVICE_MANAGER_INCLUDED
|
|
|
|
#if defined(HAVE_SYSTEMD) && !defined(EMBEDDED_LIBRARY)
|
|
/*
|
|
sd-daemon.h may include inttypes.h. Explicitly request format macros before
|
|
the first inclusion of inttypes.h.
|
|
*/
|
|
#if !defined(__STDC_FORMAT_MACROS)
|
|
#define __STDC_FORMAT_MACROS
|
|
#endif // !defined(__STDC_FORMAT_MACROS)
|
|
#include <systemd/sd-daemon.h>
|
|
/** INTERVAL in seconds followed by printf style status */
|
|
#define service_manager_extend_timeout(INTERVAL, FMTSTR, ...) \
|
|
sd_notifyf(0, "STATUS=" FMTSTR "\nEXTEND_TIMEOUT_USEC=%u\n", ##__VA_ARGS__, INTERVAL * 1000000)
|
|
/* sd_listen_fds_with_names added v227 however RHEL/Centos7 has v219, fallback to sd_listen_fds */
|
|
#ifndef HAVE_SYSTEMD_SD_LISTEN_FDS_WITH_NAMES
|
|
#define sd_listen_fds_with_names(FD, NAMES) sd_listen_fds(FD)
|
|
#endif
|
|
|
|
#else
|
|
#define sd_listen_fds(FD) (0)
|
|
#define sd_listen_fds_with_names(FD, NAMES) (0)
|
|
#define sd_is_socket_unix(FD, TYPE, LISTENING, PATH, SIZE) (0)
|
|
#define sd_is_socket_inet(FD, FAMILY, TYPE, LISTENING, PORT) (0)
|
|
#define SD_LISTEN_FDS_START (0)
|
|
#define sd_notify(X, Y)
|
|
#define sd_notifyf(E, F, ...)
|
|
#ifdef _WIN32
|
|
#define service_manager_extend_timeout(I, F, ...) \
|
|
mysqld_win_extend_service_timeout(I)
|
|
#else
|
|
#define service_manager_extend_timeout(I, FMTSTR, ...)
|
|
#endif
|
|
#endif
|
|
|
|
#endif /* MY_SERVICE_MANAGER_INCLUDED */
|