diff options
| author | Daniel Black <daniel@linux.vnet.ibm.com> | 2017-11-30 13:37:59 +1100 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-06 09:58:14 +0300 |
| commit | 1479273cdbbca57675f3c8295ebcacc768d125d5 (patch) | |
| tree | e55c7503961766b0e9601f08d8603f4470ae3ac4 /include/my_service_manager.h | |
| parent | e7f4e61f6e013e8879a64dae3ab0370ec137a121 (diff) | |
| download | mariadb-git-1479273cdbbca57675f3c8295ebcacc768d125d5.tar.gz | |
MDEV-14705: slow innodb startup/shutdown can exceed systemd timeout
Use systemd EXTEND_TIMEOUT_USEC to advise systemd of progress
Move towards progress measures rather than pure time based measures.
Progress reporting at numberious shutdown/startup locations incuding:
* For innodb_fast_shutdown=0 trx_roll_must_shutdown() for rolling back incomplete transactions.
* For merging the change buffer (in srv_shutdown(bool ibuf_merge))
* For purging history, srv_do_purge
Thanks Marko for feedback and suggestions.
Diffstat (limited to 'include/my_service_manager.h')
| -rw-r--r-- | include/my_service_manager.h | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/include/my_service_manager.h b/include/my_service_manager.h new file mode 100644 index 00000000000..4d88e992b5e --- /dev/null +++ b/include/my_service_manager.h @@ -0,0 +1,39 @@ +/* + 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-1301, 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. +*/ +#define __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) + +#else +#define sd_notify(X, Y) +#define sd_notifyf(E, F, ...) +#define service_manager_extend_timeout(I, FMTSTR, ...) +#endif + +#endif /* MY_SERVICE_MANAGER_INCLUDED */ |