|
 |
c29fdf |
From 8ad3c6bbb4556332c5a6b7fecdab73310c045b24 Mon Sep 17 00:00:00 2001
|
|
|
c29fdf |
From: Jan Friesse <jfriesse@redhat.com>
|
|
|
c29fdf |
Date: Mon, 25 Nov 2019 18:21:52 +0100
|
|
|
c29fdf |
Subject: [PATCH] votequorum: Ignore the icmap_get_* return value
|
|
|
c29fdf |
|
|
|
c29fdf |
Express intention to ignore icmap_get_* return
|
|
|
c29fdf |
value and rely on default behavior of not changing the output
|
|
|
c29fdf |
parameter on error.
|
|
|
c29fdf |
|
|
|
c29fdf |
Signed-off-by: Jan Friesse <jfriesse@redhat.com>
|
|
|
c29fdf |
(cherry picked from commit cddd62f972bca276c934e58f08da84071cec1ddb)
|
|
|
c29fdf |
---
|
|
|
c29fdf |
exec/votequorum.c | 22 +++++++++++-----------
|
|
|
c29fdf |
1 file changed, 11 insertions(+), 11 deletions(-)
|
|
|
c29fdf |
|
|
|
c29fdf |
diff --git a/exec/votequorum.c b/exec/votequorum.c
|
|
|
c29fdf |
index 49bcdfa..e3cb7eb 100644
|
|
|
c29fdf |
--- a/exec/votequorum.c
|
|
|
c29fdf |
+++ b/exec/votequorum.c
|
|
|
c29fdf |
@@ -1272,10 +1272,10 @@ static char *votequorum_readconfig(int runtime)
|
|
|
c29fdf |
/*
|
|
|
c29fdf |
* gather basic data here
|
|
|
c29fdf |
*/
|
|
|
c29fdf |
- icmap_get_uint32("quorum.expected_votes", &expected_votes);
|
|
|
c29fdf |
+ (void)icmap_get_uint32("quorum.expected_votes", &expected_votes);
|
|
|
c29fdf |
have_nodelist = votequorum_read_nodelist_configuration(&node_votes, &node_count, &node_expected_votes);
|
|
|
c29fdf |
have_qdevice = votequorum_qdevice_is_configured(&qdevice_votes);
|
|
|
c29fdf |
- icmap_get_uint8("quorum.two_node", &two_node);
|
|
|
c29fdf |
+ (void)icmap_get_uint8("quorum.two_node", &two_node);
|
|
|
c29fdf |
|
|
|
c29fdf |
/*
|
|
|
c29fdf |
* do config verification and enablement
|
|
|
c29fdf |
@@ -1320,13 +1320,13 @@ static char *votequorum_readconfig(int runtime)
|
|
|
c29fdf |
wait_for_all = 1;
|
|
|
c29fdf |
}
|
|
|
c29fdf |
|
|
|
c29fdf |
- icmap_get_uint8("quorum.allow_downscale", &allow_downscale);
|
|
|
c29fdf |
- icmap_get_uint8("quorum.wait_for_all", &wait_for_all);
|
|
|
c29fdf |
- icmap_get_uint8("quorum.last_man_standing", &last_man_standing);
|
|
|
c29fdf |
- icmap_get_uint32("quorum.last_man_standing_window", &last_man_standing_window);
|
|
|
c29fdf |
- icmap_get_uint8("quorum.expected_votes_tracking", &ev_tracking);
|
|
|
c29fdf |
- icmap_get_uint8("quorum.auto_tie_breaker", &atb;;
|
|
|
c29fdf |
- icmap_get_string("quorum.auto_tie_breaker_node", &atb_string);
|
|
|
c29fdf |
+ (void)icmap_get_uint8("quorum.allow_downscale", &allow_downscale);
|
|
|
c29fdf |
+ (void)icmap_get_uint8("quorum.wait_for_all", &wait_for_all);
|
|
|
c29fdf |
+ (void)icmap_get_uint8("quorum.last_man_standing", &last_man_standing);
|
|
|
c29fdf |
+ (void)icmap_get_uint32("quorum.last_man_standing_window", &last_man_standing_window);
|
|
|
c29fdf |
+ (void)icmap_get_uint8("quorum.expected_votes_tracking", &ev_tracking);
|
|
|
c29fdf |
+ (void)icmap_get_uint8("quorum.auto_tie_breaker", &atb;;
|
|
|
c29fdf |
+ (void)icmap_get_string("quorum.auto_tie_breaker_node", &atb_string);
|
|
|
c29fdf |
|
|
|
c29fdf |
/* auto_tie_breaker defaults to LOWEST */
|
|
|
c29fdf |
if (atb) {
|
|
|
c29fdf |
@@ -1518,7 +1518,7 @@ static char *votequorum_readconfig(int runtime)
|
|
|
c29fdf |
us->expected_votes = node_expected_votes;
|
|
|
c29fdf |
} else {
|
|
|
c29fdf |
us->votes = 1;
|
|
|
c29fdf |
- icmap_get_uint32("quorum.votes", &us->votes);
|
|
|
c29fdf |
+ (void)icmap_get_uint32("quorum.votes", &us->votes);
|
|
|
c29fdf |
}
|
|
|
c29fdf |
|
|
|
c29fdf |
if (expected_votes) {
|
|
|
c29fdf |
@@ -1569,7 +1569,7 @@ static void votequorum_refresh_config(
|
|
|
c29fdf |
return ;
|
|
|
c29fdf |
}
|
|
|
c29fdf |
|
|
|
c29fdf |
- icmap_get_uint8("quorum.cancel_wait_for_all", &cancel_wfa);
|
|
|
c29fdf |
+ (void)icmap_get_uint8("quorum.cancel_wait_for_all", &cancel_wfa);
|
|
|
c29fdf |
if (strcmp(key_name, "quorum.cancel_wait_for_all") == 0 &&
|
|
|
c29fdf |
cancel_wfa >= 1) {
|
|
|
c29fdf |
icmap_set_uint8("quorum.cancel_wait_for_all", 0);
|
|
|
c29fdf |
--
|
|
|
c29fdf |
1.8.3.1
|
|
|
c29fdf |
|