From 6986aa1d0a352d8d02eed4896034631fffd25a27 Mon Sep 17 00:00:00 2001 From: Gerhard Lausser Date: Tue, 1 Oct 2013 08:57:10 +0200 Subject: Don't let check_disk hang on hanging file systems --- plugins/check_disk.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'plugins/check_disk.c') diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 0d73a4f1..a66aaf09 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -51,6 +51,9 @@ const char *email = "devel@monitoring-plugins.org"; # include #endif #include "regex.h" +#if HAVE_PTHREAD_H +# include +#endif #ifdef __CYGWIN__ # include @@ -130,6 +133,7 @@ void print_help (void); void print_usage (void); double calculate_percent(uintmax_t, uintmax_t); void stat_path (struct parameter_list *p); +void do_stat_path (struct parameter_list *p); void get_stats (struct parameter_list *p, struct fs_usage *fsp); void get_path_stats (struct parameter_list *p, struct fs_usage *fsp); @@ -967,6 +971,42 @@ print_usage (void) void stat_path (struct parameter_list *p) +{ +#ifdef HAVE_PTHREAD_H + pthread_t stat_thread; + int status; + int statdone = 0; + int timer = timeout_interval; + struct timespec req, rem; + req.tv_sec = 0; + pthread_create(&stat_thread, NULL, do_stat_path, p); + while (timer-- > 0) { + req.tv_nsec = 10000000; + nanosleep(&req, &rem); + if (pthread_kill(stat_thread, 0)) { + statdone = 1; + break; + } else { + req.tv_nsec = 990000000; + nanosleep(&req, &rem); + } + } + if (statdone == 1) { + pthread_join(stat_thread, (void *)&status); + } else { + pthread_detach(stat_thread); + if (verbose >= 3) + printf("stat did not return within %ds on %s\n", timeout_interval, p->name); + printf("DISK %s - ", _("CRITICAL")); + die (STATE_CRITICAL, _("%s %s: %s\n"), p->name, _("hangs"), _("Timeout")); + } +#else + do_stat_path(p); +#endif +} + +void +do_stat_path (struct parameter_list *p) { /* Stat entry to check that dir exists and is accessible */ if (verbose >= 3) -- cgit v1.2.3