upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-04-22 14:46:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't let check_disk hang on hanging file systems

Browse source
This commit is contained in:
Gerhard Lausser 2013-10-01 08:57:10 +02:00 committed by Holger Weiss
parent f3b789a526
commit 6986aa1d0a
3 changed files with 53 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -544,6 +544,18 @@ else
with_gnutls="no"
fi
dnl Check for POSIX thread libraries
AC_CHECK_HEADERS(pthread.h)
case $host in
*sun* | *solaris*)
AC_CHECK_LIB(pthread,pthread_create,THRLIBS="-lpthread -lrt")
;;
*)
AC_CHECK_LIB(pthread,pthread_create,THRLIBS="-lpthread")
;;
esac
AC_SUBST(THRLIBS)
dnl
dnl Checks for header files.
dnl

2
plugins/Makefile.am
View file

@ -71,7 +71,7 @@ check_apt_LDADD = $(BASEOBJS)
check_cluster_LDADD = $(BASEOBJS)
check_dbi_LDADD = $(NETLIBS) $(DBILIBS)
check_dig_LDADD = $(NETLIBS)
check_disk_LDADD = $(BASEOBJS)
check_disk_LDADD = $(BASEOBJS) $(THRLIBS)
check_dns_LDADD = $(NETLIBS)
check_dummy_LDADD = $(BASEOBJS)
check_fping_LDADD = $(NETLIBS)

40
plugins/check_disk.c
View file

@ -51,6 +51,9 @@ const char *email = "devel@monitoring-plugins.org";
# include <limits.h>
#endif
#include "regex.h"
#if HAVE_PTHREAD_H
# include <pthread.h>
#endif
#ifdef __CYGWIN__
# include <windows.h>
@ -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)