ACK
Reviewed-By: Christine Caulfield <ccaulfie@xxxxxxxxxx>
On 02/03/12 11:02, Fabio M. Di Nitto wrote:
From: "Fabio M. Di Nitto"<fdinitto@xxxxxxxxxx>
simply taking the safest path here since integration of qdevice is not
fully complete
Signed-off-by: Fabio M. Di Nitto<fdinitto@xxxxxxxxxx>
---
exec/votequorum.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/exec/votequorum.c b/exec/votequorum.c
index 9d489bb..eda6daa 100644
--- a/exec/votequorum.c
+++ b/exec/votequorum.c
@@ -970,6 +970,17 @@ static char *votequorum_readconfig(int runtime)
}
}
+ if ((have_qdevice)&& (leave_remove)) {
+ if (!runtime) {
+ error = (char *)"configuration error: quorum.device is not compatible with leave_remove";
+ goto out;
+ } else {
+ log_printf(LOGSYS_LEVEL_CRIT, "configuration error: quorum.device is not compatible with leave_remove");
+ log_printf(LOGSYS_LEVEL_CRIT, "disabling quorum device operations");
+ update_qdevice_can_operate(0);
+ }
+ }
+
/*
* if user specifies quorum.expected_votes + quorum.device but NOT the device.votes
* we don't know what the quorum device should vote.
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
