Marcus Meissner
f45a4f9a5e
forward-port several patches from sle11sp3.bnc#831518 OBS-URL: https://build.opensuse.org/request/show/227422 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=85
50 lines
1.2 KiB
Diff
50 lines
1.2 KiB
Diff
From 5070ffbca7b16e4139b3da72bdff0c9add517351 Mon Sep 17 00:00:00 2001
|
|
From: Zdenek Kabelac <zkabelac@redhat.com>
|
|
Date: Wed, 17 Apr 2013 23:16:30 +0200
|
|
Subject: [PATCH] clvmd: avoid logging in signal handler
|
|
|
|
debuglog in the main thread.
|
|
---
|
|
daemons/clvmd/clvmd.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
|
|
index c649bbe..a64bd54 100644
|
|
--- a/daemons/clvmd/clvmd.c
|
|
+++ b/daemons/clvmd/clvmd.c
|
|
@@ -874,6 +874,7 @@ static void main_loop(int local_sock, int cmd_timeout)
|
|
int saved_errno = errno;
|
|
|
|
reread_config = 0;
|
|
+ DEBUGLOG("got SIGHUP\n");
|
|
if (clops->reread_config)
|
|
clops->reread_config();
|
|
errno = saved_errno;
|
|
@@ -982,6 +983,8 @@ static void main_loop(int local_sock, int cmd_timeout)
|
|
|
|
closedown:
|
|
clops->cluster_closedown();
|
|
+ if (quit)
|
|
+ DEBUGLOG("SIGTERM received\n");
|
|
}
|
|
|
|
static __attribute__ ((noreturn)) void wait_for_child(int c_pipe, int timeout)
|
|
@@ -2253,14 +2256,12 @@ static void sigusr2_handler(int sig)
|
|
|
|
static void sigterm_handler(int sig)
|
|
{
|
|
- DEBUGLOG("SIGTERM received\n");
|
|
quit = 1;
|
|
return;
|
|
}
|
|
|
|
static void sighup_handler(int sig)
|
|
{
|
|
- DEBUGLOG("got SIGHUP\n");
|
|
reread_config = 1;
|
|
}
|
|
|
|
--
|
|
1.8.4.5
|
|
|