4
0
Эх сурвалжийг харах

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 <fdinitto@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
Fabio M. Di Nitto 14 жил өмнө
parent
commit
edf0728323
1 өөрчлөгдсөн 11 нэмэгдсэн , 0 устгасан
  1. 11 0
      exec/votequorum.c

+ 11 - 0
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.