[Debian-ha-commits] [libqb] 01/01: Create debian/patches/0001-Fix-check_ipc-tests-so-they-exit-correctly.patch.

[Adrian Vondendriesch]

This is an automated email from the git hooks/post-receive script.

discostu-guest pushed a commit to branch master
in repository libqb.

commit abb2a609e7ddea2fd764762264ad6824cb4ee313
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Sun Sep 20 17:53:40 2015 +0200

    Create debian/patches/0001-Fix-check_ipc-tests-so-they-exit-correctly.patch.
    
    All changes provided within the patch are already upstream. We need to remove
    this patch within the next upstream release.
    
    Signed-off-by: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
---
 debian/changelog                                   |  5 +++
 ...ix-check_ipc-tests-so-they-exit-correctly.patch | 45 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c939bc7..9cca0f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 libqb (0.17.2-1) UNRELEASED; urgency=medium
 
+  [ Christoph Berg ]
   * New upstream version, including all our patches!
 
+  [ Adrian Vondendriesch ]
+  * Create 0001-Fix-check_ipc-tests-so-they-exit-correctly.patch to fix
+    ipc.test.
+
  -- Christoph Berg <christoph.berg at credativ.de>  Mon, 07 Sep 2015 15:07:19 +0200
 
 libqb (0.17.1-6) experimental; urgency=medium
diff --git a/debian/patches/0001-Fix-check_ipc-tests-so-they-exit-correctly.patch b/debian/patches/0001-Fix-check_ipc-tests-so-they-exit-correctly.patch
new file mode 100644
index 0000000..292a432
--- /dev/null
+++ b/debian/patches/0001-Fix-check_ipc-tests-so-they-exit-correctly.patch
@@ -0,0 +1,45 @@
+From aec4cde4312ada559888371554b0ae862cf91b9a Mon Sep 17 00:00:00 2001
+From: Christine Caulfield <ccaulfie at redhat.com>
+Date: Fri, 11 Sep 2015 09:16:52 +0100
+Subject: [PATCH] Fix check_ipc tests so they exit correctly
+
+On some platforms the check_ipc test can fail due to SIGTERM
+being delivered to to exiting server process. There is a race
+condition between the server main loop quitting and the
+signal being delivered.
+
+This patch closes that race loophole in two places, firstly
+it makes SIGTERM/SIGSTOP exit immediately rather than just signalling
+the mainloop, secondly it calls exit() rather than return when the server
+mainloop completes to that the client code does not start executing!
+
+Signed-off-by: Christine Caulfield <ccaulfie at redhat.com>
+---
+ tests/check_ipc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/check_ipc.c b/tests/check_ipc.c
+index 4397963..26985df 100644
+--- a/tests/check_ipc.c
++++ b/tests/check_ipc.c
+@@ -102,7 +102,7 @@ exit_handler(int32_t rsignal, void *data)
+ {
+ 	qb_log(LOG_DEBUG, "caught signal %d", rsignal);
+ 	qb_ipcs_destroy(s1);
+-	return -1;
++	exit(0);
+ }
+ 
+ static void
+@@ -424,7 +424,7 @@ run_function_in_new_process(void (*run_ipc_server_fn)(void))
+ 
+ 	if (pid == 0) {
+ 		run_ipc_server_fn();
+-		return 0;
++		exit(0);
+ 	}
+ 	return pid;
+ }
+-- 
+2.5.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c904b40
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-check_ipc-tests-so-they-exit-correctly.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/libqb.git