From edf072832392c75154bb602e47f6355d5d00a1fd Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Thu, 1 Mar 2012 14:42:01 +0100 Subject: [PATCH] votequorum: disallow special features vs qdevice simply taking the safest path here since integration of qdevice is not fully complete Signed-off-by: Fabio M. Di Nitto Reviewed-by: Christine Caulfield --- exec/votequorum.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/exec/votequorum.c b/exec/votequorum.c index 9d489bb1..eda6daaf 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.