58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
From bb58699a47a7b9070d555490f980c33caa3066e9 Mon Sep 17 00:00:00 2001
|
|
From: Jan Friesse <jfriesse@redhat.com>
|
|
Date: Mon, 8 Jun 2020 15:38:06 +0200
|
|
Subject: [PATCH] pacemaker: Handle updated exit code of crm_ticket
|
|
|
|
crm_ticket included since Pacemaker version 2.0.0-rc2 doesn't return
|
|
EPERM (1) error code any longer when ticket is updated without using
|
|
--force. Instead new value CRM_EX_INSUFFICIENT_PRIV (4) is used.
|
|
|
|
This return value is used in the test_atomicity function which is
|
|
failing with new enough Pacemaker.
|
|
|
|
Solution is to check also for return code 4.
|
|
|
|
Also previously when unexpected code is returned, log contained full
|
|
return value as returned by system call. This is not very readable so
|
|
use only exit status (WEXITSTATUS) instead.
|
|
|
|
Signed-off-by: Jan Friesse <jfriesse@redhat.com>
|
|
---
|
|
src/pacemaker.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/pacemaker.c b/src/pacemaker.c
|
|
index 7e3f9e6..1582fa8 100644
|
|
--- a/src/pacemaker.c
|
|
+++ b/src/pacemaker.c
|
|
@@ -59,6 +59,7 @@ enum atomic_ticket_supported atomicity = UNKNOWN;
|
|
* - the old version asks for "Y/N" via STDIN, and returns 0
|
|
* when reading "no";
|
|
* - the new version just reports an error without asking.
|
|
+ * Since 2.0.0-rc2 error code is changed from 1 (EPERM) to 4 (CRM_EX_INSUFFICIENT_PRIV)
|
|
*/
|
|
static void test_atomicity(void)
|
|
{
|
|
@@ -86,7 +87,8 @@ static void test_atomicity(void)
|
|
log_info("Old \"crm_ticket\" found, using non-atomic ticket updates.");
|
|
break;
|
|
|
|
- case 1:
|
|
+ case 1: /* Pacemaker < 2.0.0-rc2 - EPERM */
|
|
+ case 4: /* Pacemaker >= 2.0.0-rc2 - CRM_EX_INSUFFICIENT_PRIV */
|
|
atomicity = YES;
|
|
log_info("New \"crm_ticket\" found, using atomic ticket updates.");
|
|
break;
|
|
@@ -94,7 +96,7 @@ static void test_atomicity(void)
|
|
default:
|
|
log_error("Unexpected return value from \"crm_ticket\" (%d), "
|
|
"falling back to non-atomic ticket updates.",
|
|
- rv);
|
|
+ WEXITSTATUS(rv));
|
|
atomicity = NO;
|
|
}
|
|
|
|
--
|
|
2.18.2
|
|
|