|
 |
7100e8 |
commit 2c3992bd6ad2dbcde5a39f8e02059cd99271fabd
|
|
|
7100e8 |
Author: David Vossel <dvossel@redhat.com>
|
|
|
7100e8 |
Date: Tue Mar 25 16:34:02 2014 -0500
|
|
|
7100e8 |
|
|
|
7100e8 |
Low: controld: Remove '-q 0' from default dlm_controld arguments
|
|
|
7100e8 |
|
|
|
7100e8 |
The '-q 0' argument allows the dlm to fence nodes even when
|
|
|
7100e8 |
quorum is lost. This is not a desired default.
|
|
|
7100e8 |
|
|
|
7100e8 |
Resolves: rhbz#1064519
|
|
|
7100e8 |
(cherry picked from commit 20472946f54b0f6f07d286d96e5fb17baaf230ef)
|
|
|
7100e8 |
|
|
|
7100e8 |
diff --git a/extra/resources/controld b/extra/resources/controld
|
|
|
7100e8 |
index 2cc5f4d..a58d4ec 100644
|
|
|
7100e8 |
--- a/extra/resources/controld
|
|
|
7100e8 |
+++ b/extra/resources/controld
|
|
|
7100e8 |
@@ -61,7 +61,7 @@ In most cases, it should be run as an anonymous clone.
|
|
|
7100e8 |
Any additional options to start the dlm_controld service with
|
|
|
7100e8 |
</longdesc>
|
|
|
7100e8 |
<shortdesc lang="en">DLM Options</shortdesc>
|
|
|
7100e8 |
-<content type="string" default="-q 0" />
|
|
|
7100e8 |
+<content type="string" default="-s 0" />
|
|
|
7100e8 |
</parameter>
|
|
|
7100e8 |
|
|
|
7100e8 |
<parameter name="configdir" unique="1">
|
|
|
7100e8 |
@@ -251,11 +251,11 @@ case "$OCF_RESOURCE_INSTANCE" in
|
|
|
7100e8 |
: ${OCF_RESKEY_daemon=gfs_controld${daemon_ext}}
|
|
|
7100e8 |
;;
|
|
|
7100e8 |
*[dD][lL][mM]*)
|
|
|
7100e8 |
- : ${OCF_RESKEY_args=-q 0 -s 0}
|
|
|
7100e8 |
+ : ${OCF_RESKEY_args=-s 0}
|
|
|
7100e8 |
: ${OCF_RESKEY_daemon=dlm_controld${daemon_ext}}
|
|
|
7100e8 |
;;
|
|
|
7100e8 |
*)
|
|
|
7100e8 |
- : ${OCF_RESKEY_args=-q 0 -s 0}
|
|
|
7100e8 |
+ : ${OCF_RESKEY_args=-s 0}
|
|
|
7100e8 |
: ${OCF_RESKEY_daemon=dlm_controld${daemon_ext}}
|
|
|
7100e8 |
esac
|
|
|
7100e8 |
|