cluster: STABLE32 - cluster.rng: retab the head (use space uniformly)
by Jan Pokorný
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=606ad31b5c7...
Commit: 606ad31b5c7d31b33c74633e048d6b89666a183f
Parent: cfb783ffbd4c6a47175e837e8e890e622537f929
Author: Jan Pokorný <jpokorny(a)redhat.com>
AuthorDate: Thu Aug 16 21:48:16 2012 +0200
Committer: Jan Pokorný <jpokorny(a)redhat.com>
CommitterDate: Thu Aug 16 21:48:16 2012 +0200
cluster.rng: retab the head (use space uniformly)
Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com>
---
config/tools/xml/cluster.rng.in.head | 36 +++++++++++++++++-----------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in.head b/config/tools/xml/cluster.rng.in.head
index b994096..003ceaf 100644
--- a/config/tools/xml/cluster.rng.in.head
+++ b/config/tools/xml/cluster.rng.in.head
@@ -283,10 +283,10 @@ To validate your cluster.conf against this schema, run:
chosen." rha:sample="active"/>
</optional>
<optional>
- <attribute name="rrp_problem_count_threshold"
- rha:description="This specifies the number of times a problem is detected
- with a link before setting the link faulty. Once a link is set faulty, no
- more data is transmitted upon it. Corosync default is 10, cman default is 3"
+ <attribute name="rrp_problem_count_threshold" rha:description="This
+ specifies the number of times a problem is detected with a link
+ before setting the link faulty. Once a link is set faulty, no more
+ data is transmitted upon it. Corosync default is 10, cman default is 3"
rha:default="3" rha:sample="5"/>
</optional>
<optional>
@@ -434,36 +434,36 @@ To validate your cluster.conf against this schema, run:
<!-- fence_daemon block -->
<optional>
<element name="fence_daemon" rha:description="Configuration for fenced
- daemon. fenced(8)">
+ daemon. fenced(8)">
<optional>
<attribute name="post_join_delay" rha:description="Number of seconds
- the daemon will wait before fencing any victims after a node joins
- the fence domain. fenced(8)"/>
+ the daemon will wait before fencing any victims after a node joins
+ the fence domain. fenced(8)"/>
</optional>
<optional>
<attribute name="post_fail_delay" rha:description="Number of seconds
- the daemon will wait before fencing any victims after a node
- fails. fenced(8)"/>
+ the daemon will wait before fencing any victims after a node
+ fails. fenced(8)"/>
</optional>
<optional>
<attribute name="override_path" rha:description="Location of a FIFO
- used for communication between fenced and fence_ack_manual.
- fenced(8)"/>
+ used for communication between fenced and fence_ack_manual.
+ fenced(8)"/>
</optional>
<optional>
<attribute name="override_time" rha:description="Number of seconds to
- wait for a manual override after a failed fencing attempt before
- the next attempt. fenced(8)"/>
+ wait for a manual override after a failed fencing attempt before
+ the next attempt. fenced(8)"/>
</optional>
<optional>
<attribute name="clean_start" rha:description="Set to 1 to disable
- startup fencing. fenced(8)"/>
+ startup fencing. fenced(8)"/>
</optional>
<optional>
<attribute name="skip_undefined" rha:description="Set to 1 to disable
- startup fencing of nodes with no fence methods defined.
- fenced(8)"/>
+ startup fencing of nodes with no fence methods defined.
+ fenced(8)"/>
</optional>
</element>
</optional>
@@ -482,12 +482,12 @@ To validate your cluster.conf against this schema, run:
if domU recovery is expected to be automatic.">
<optional>
<attribute name="debug" rha:description="" >
- <data type="integer"/>
+ <data type="integer"/>
</attribute>
</optional>
<optional>
<attribute name="port" rha:description="" >
- <data type="integer"/>
+ <data type="integer"/>
</attribute>
</optional>
<optional>
11 years, 8 months
cluster: STABLE32 - cluster.rng: fencedevice initial non-digit note to description
by Jan Pokorný
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=cfb783ffbd4...
Commit: cfb783ffbd4c6a47175e837e8e890e622537f929
Parent: a0c861a46105404a4c8e0c5937846f6215ee4bf8
Author: Jan Pokorný <jpokorny(a)redhat.com>
AuthorDate: Thu Aug 16 21:40:37 2012 +0200
Committer: Jan Pokorný <jpokorny(a)redhat.com>
CommitterDate: Thu Aug 16 21:42:49 2012 +0200
cluster.rng: fencedevice initial non-digit note to description
(as an echo of rhbz#808441)
Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com>
---
config/tools/xml/cluster.rng.in.head | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in.head b/config/tools/xml/cluster.rng.in.head
index af6aa12..b994096 100644
--- a/config/tools/xml/cluster.rng.in.head
+++ b/config/tools/xml/cluster.rng.in.head
@@ -820,6 +820,7 @@ To validate your cluster.conf against this schema, run:
<attribute name="name" rha:description="A name that is used to
reference this fence device from clusternode fence section.
+ For XML validation purposes, it shall not start with a digit.
fenced(8)">
<data type="ID"/>
</attribute>
11 years, 8 months
cluster: STABLE32 - cluster.rng: fix trailing whitespaces in head
by Jan Pokorný
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=a0c861a4610...
Commit: a0c861a46105404a4c8e0c5937846f6215ee4bf8
Parent: cb7848612a50a06ab981b687ecdc31e455fe2cd9
Author: Jan Pokorný <jpokorny(a)redhat.com>
AuthorDate: Thu Aug 16 17:29:32 2012 +0200
Committer: Jan Pokorný <jpokorny(a)redhat.com>
CommitterDate: Thu Aug 16 17:29:32 2012 +0200
cluster.rng: fix trailing whitespaces in head
Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com>
---
config/tools/xml/cluster.rng.in.head | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in.head b/config/tools/xml/cluster.rng.in.head
index 4e3d901..af6aa12 100644
--- a/config/tools/xml/cluster.rng.in.head
+++ b/config/tools/xml/cluster.rng.in.head
@@ -72,7 +72,7 @@ To validate your cluster.conf against this schema, run:
</optional>
<optional>
<attribute name="disallowed" rha:description="Set this to 1 enable
- cman's Disallowed mode. This is usually only needed for
+ cman's Disallowed mode. This is usually only needed for
backwards compatibility." rha:sample="1">
<data type="nonNegativeInteger"/>
</attribute>
@@ -1068,7 +1068,7 @@ To validate your cluster.conf against this schema, run:
</optional>
<optional>
- <attribute name="ttl" rha:description="The multicast TTL
+ <attribute name="ttl" rha:description="The multicast TTL
to use on the second interface. cman(5)"/>
</optional>
</element>
11 years, 8 months
cluster: RHEL61 - cman init: clarify better comments for FENCE_JOIN=no
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=c640e8614fd...
Commit: c640e8614fd5ade548e0e83e9eb21a51db74413b
Parent: 371ed3e13b2a75d7844414349023b7ba253e6518
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Jul 24 11:24:39 2012 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Aug 17 10:35:46 2012 +0200
cman init: clarify better comments for FENCE_JOIN=no
(input from GSS)
Related: rhbz#849047
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
cman/init.d/cman.in | 7 ++++---
cman/init.d/cman.init.defaults.in | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 8e6af45..f586722 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -123,9 +123,10 @@ fi
# set to "yes", then the script will attempt to join the fence domain.
# If FENCE_JOIN is set to any other value, the default behavior is
# to join the fence domain (equivalent to "yes").
-# When setting FENCE_JOIN to "no", it is important to check
-# DLM_CONTROLD_OPTS to reflect expected behavior regarding fencing
-# and quorum.
+# When setting FENCE_JOIN to "no", it is important to also set
+# DLM_CONTROLD_OPTS="-f0" (at least) for correct operation.
+# Please note that clusters without fencing are not
+# supported by Red Hat except for MRG installations.
[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
# FENCED_OPTS -- allow extra options to be passed to fence daemon.
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index 6e7f47f..1b7913e 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -50,9 +50,10 @@
# set to "yes", then the script will attempt to join the fence domain.
# If FENCE_JOIN is set to any other value, the default behavior is
# to join the fence domain (equivalent to "yes").
-# When setting FENCE_JOIN to "no", it is important to check
-# DLM_CONTROLD_OPTS to reflect expected behavior regarding fencing
-# and quorum.
+# When setting FENCE_JOIN to "no", it is important to also set
+# DLM_CONTROLD_OPTS="-f0" (at least) for correct operation.
+# Please note that clusters without fencing are not
+# supported by Red Hat except for MRG installations.
#FENCE_JOIN="yes"
# FENCED_OPTS -- allow extra options to be passed to fence daemon.
11 years, 8 months
cluster: RHEL61 - cman init: add extra documentation for FENCE_JOIN=""
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=371ed3e13b2...
Commit: 371ed3e13b2a75d7844414349023b7ba253e6518
Parent: 11ea03948aa75bbf0ddc37029fc970e96755ef2d
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue May 15 16:37:13 2012 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Aug 17 10:35:33 2012 +0200
cman init: add extra documentation for FENCE_JOIN=""
Related: rhbz#849047
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
cman/init.d/cman.in | 3 +++
cman/init.d/cman.init.defaults.in | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index cb548c6..8e6af45 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -123,6 +123,9 @@ fi
# set to "yes", then the script will attempt to join the fence domain.
# If FENCE_JOIN is set to any other value, the default behavior is
# to join the fence domain (equivalent to "yes").
+# When setting FENCE_JOIN to "no", it is important to check
+# DLM_CONTROLD_OPTS to reflect expected behavior regarding fencing
+# and quorum.
[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
# FENCED_OPTS -- allow extra options to be passed to fence daemon.
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index d6d010c..6e7f47f 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -50,6 +50,9 @@
# set to "yes", then the script will attempt to join the fence domain.
# If FENCE_JOIN is set to any other value, the default behavior is
# to join the fence domain (equivalent to "yes").
+# When setting FENCE_JOIN to "no", it is important to check
+# DLM_CONTROLD_OPTS to reflect expected behavior regarding fencing
+# and quorum.
#FENCE_JOIN="yes"
# FENCED_OPTS -- allow extra options to be passed to fence daemon.
11 years, 8 months
cluster: RHEL61 - cman init: allow sysconfig/cman to pass options to dlm_controld
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=11ea03948aa...
Commit: 11ea03948aa75bbf0ddc37029fc970e96755ef2d
Parent: 63c82dd8e3977c9073e3e74967647b80bf777138
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue May 15 13:53:28 2012 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Aug 17 10:35:18 2012 +0200
cman init: allow sysconfig/cman to pass options to dlm_controld
DLM_CONTROLD_OPTS="" can now be used to pass startup options to the
daemon.
Resolves: rhbz#849047
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
cman/init.d/cman.in | 5 ++++-
cman/init.d/cman.init.defaults.in | 3 +++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 258df48..cb548c6 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -104,6 +104,9 @@ fi
# no (default) | cman will not start sshd
[ -z "$CMAN_SSHD_START" ] && CMAN_SSHD_START=no
+# DLM_CONTROLD_OPTS -- allow extra options to be passed to dlm_controld daemon.
+[ -z "$DLM_CONTROLD_OPTS" ] && DLM_CONTROLD_OPTS=""
+
# FENCE_JOIN_TIMEOUT -- seconds to wait for fence domain join to
# complete. If the join hasn't completed in this time, fence_tool join
# exits with an error, and this script exits with an error. To wait
@@ -609,7 +612,7 @@ stop_fenced()
start_dlm_controld()
{
- start_daemon dlm_controld || return 1
+ start_daemon dlm_controld "$DLM_CONTROLD_OPTS" || return 1
if [ "$INITLOGLEVEL" = "full" ]; then
ok
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index 05c3bc7..d6d010c 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -31,6 +31,9 @@
# no (default) | cman will not start sshd
#CMAN_SSHD_START=no
+# DLM_CONTROLD_OPTS -- allow extra options to be passed to dlm_controld daemon.
+#DLM_CONTROLD_OPTS=""
+
# FENCE_JOIN_TIMEOUT -- seconds to wait for fence domain join to
# complete. If the join hasn't completed in this time, fence_tool join
# exits with an error, and this script exits with an error. To wait
11 years, 8 months
cluster: RHEL62 - cman init: clarify better comments for FENCE_JOIN=no
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=9b6944ca86f...
Commit: 9b6944ca86fcad4de783fb7ce378338992ef3e69
Parent: dc239ccb1350e11f184f0724675b0733cf0807e6
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Jul 24 11:24:39 2012 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Aug 17 10:34:27 2012 +0200
cman init: clarify better comments for FENCE_JOIN=no
(input from GSS)
Related: rhbz#849048
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
cman/init.d/cman.in | 7 ++++---
cman/init.d/cman.init.defaults.in | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index c3313cd..a50f7be 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -123,9 +123,10 @@ fi
# set to "yes", then the script will attempt to join the fence domain.
# If FENCE_JOIN is set to any other value, the default behavior is
# to join the fence domain (equivalent to "yes").
-# When setting FENCE_JOIN to "no", it is important to check
-# DLM_CONTROLD_OPTS to reflect expected behavior regarding fencing
-# and quorum.
+# When setting FENCE_JOIN to "no", it is important to also set
+# DLM_CONTROLD_OPTS="-f0" (at least) for correct operation.
+# Please note that clusters without fencing are not
+# supported by Red Hat except for MRG installations.
[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
# FENCED_OPTS -- allow extra options to be passed to fence daemon.
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index 6e7f47f..1b7913e 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -50,9 +50,10 @@
# set to "yes", then the script will attempt to join the fence domain.
# If FENCE_JOIN is set to any other value, the default behavior is
# to join the fence domain (equivalent to "yes").
-# When setting FENCE_JOIN to "no", it is important to check
-# DLM_CONTROLD_OPTS to reflect expected behavior regarding fencing
-# and quorum.
+# When setting FENCE_JOIN to "no", it is important to also set
+# DLM_CONTROLD_OPTS="-f0" (at least) for correct operation.
+# Please note that clusters without fencing are not
+# supported by Red Hat except for MRG installations.
#FENCE_JOIN="yes"
# FENCED_OPTS -- allow extra options to be passed to fence daemon.
11 years, 8 months
cluster: RHEL62 - cman init: add extra documentation for FENCE_JOIN=""
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=dc239ccb135...
Commit: dc239ccb1350e11f184f0724675b0733cf0807e6
Parent: f946c07bf3431ed3582fdc8b670da95fc95990d5
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue May 15 16:37:13 2012 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Aug 17 10:34:11 2012 +0200
cman init: add extra documentation for FENCE_JOIN=""
Related: rhbz#849048
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
cman/init.d/cman.in | 3 +++
cman/init.d/cman.init.defaults.in | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index d5db6c1..c3313cd 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -123,6 +123,9 @@ fi
# set to "yes", then the script will attempt to join the fence domain.
# If FENCE_JOIN is set to any other value, the default behavior is
# to join the fence domain (equivalent to "yes").
+# When setting FENCE_JOIN to "no", it is important to check
+# DLM_CONTROLD_OPTS to reflect expected behavior regarding fencing
+# and quorum.
[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
# FENCED_OPTS -- allow extra options to be passed to fence daemon.
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index d6d010c..6e7f47f 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -50,6 +50,9 @@
# set to "yes", then the script will attempt to join the fence domain.
# If FENCE_JOIN is set to any other value, the default behavior is
# to join the fence domain (equivalent to "yes").
+# When setting FENCE_JOIN to "no", it is important to check
+# DLM_CONTROLD_OPTS to reflect expected behavior regarding fencing
+# and quorum.
#FENCE_JOIN="yes"
# FENCED_OPTS -- allow extra options to be passed to fence daemon.
11 years, 8 months
cluster: RHEL62 - cman init: allow sysconfig/cman to pass options to dlm_controld
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=f946c07bf34...
Commit: f946c07bf3431ed3582fdc8b670da95fc95990d5
Parent: 188a980e506b14cfdf94de9129360dd10f5a53d6
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue May 15 13:53:28 2012 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Aug 17 10:33:50 2012 +0200
cman init: allow sysconfig/cman to pass options to dlm_controld
DLM_CONTROLD_OPTS="" can now be used to pass startup options to the
daemon.
Resolves: rhbz#849048
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
cman/init.d/cman.in | 5 ++++-
cman/init.d/cman.init.defaults.in | 3 +++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 48fab3c..d5db6c1 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -104,6 +104,9 @@ fi
# no (default) | cman will not start sshd
[ -z "$CMAN_SSHD_START" ] && CMAN_SSHD_START=no
+# DLM_CONTROLD_OPTS -- allow extra options to be passed to dlm_controld daemon.
+[ -z "$DLM_CONTROLD_OPTS" ] && DLM_CONTROLD_OPTS=""
+
# FENCE_JOIN_TIMEOUT -- seconds to wait for fence domain join to
# complete. If the join hasn't completed in this time, fence_tool join
# exits with an error, and this script exits with an error. To wait
@@ -609,7 +612,7 @@ stop_fenced()
start_dlm_controld()
{
- start_daemon dlm_controld || return 1
+ start_daemon dlm_controld "$DLM_CONTROLD_OPTS" || return 1
if [ "$INITLOGLEVEL" = "full" ]; then
ok
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index 05c3bc7..d6d010c 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -31,6 +31,9 @@
# no (default) | cman will not start sshd
#CMAN_SSHD_START=no
+# DLM_CONTROLD_OPTS -- allow extra options to be passed to dlm_controld daemon.
+#DLM_CONTROLD_OPTS=""
+
# FENCE_JOIN_TIMEOUT -- seconds to wait for fence domain join to
# complete. If the join hasn't completed in this time, fence_tool join
# exits with an error, and this script exits with an error. To wait
11 years, 8 months
cluster: RHEL63 - cman init: clarify better comments for FENCE_JOIN=no
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=1e10d53231e...
Commit: 1e10d53231e4383fac90fc71584170797cbad9e8
Parent: 356cbad91438bf957e9ec9866e8863125d1b7dc5
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Jul 24 11:24:39 2012 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Aug 17 10:31:22 2012 +0200
cman init: clarify better comments for FENCE_JOIN=no
(input from GSS)
Related: rhbz#849049
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
cman/init.d/cman.in | 7 ++++---
cman/init.d/cman.init.defaults.in | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index f39a9aa..9a0d726 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -126,9 +126,10 @@ fi
# set to "yes", then the script will attempt to join the fence domain.
# If FENCE_JOIN is set to any other value, the default behavior is
# to join the fence domain (equivalent to "yes").
-# When setting FENCE_JOIN to "no", it is important to check
-# DLM_CONTROLD_OPTS to reflect expected behavior regarding fencing
-# and quorum.
+# When setting FENCE_JOIN to "no", it is important to also set
+# DLM_CONTROLD_OPTS="-f0" (at least) for correct operation.
+# Please note that clusters without fencing are not
+# supported by Red Hat except for MRG installations.
[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
# FENCED_OPTS -- allow extra options to be passed to fence daemon.
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index 6e7f47f..1b7913e 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -50,9 +50,10 @@
# set to "yes", then the script will attempt to join the fence domain.
# If FENCE_JOIN is set to any other value, the default behavior is
# to join the fence domain (equivalent to "yes").
-# When setting FENCE_JOIN to "no", it is important to check
-# DLM_CONTROLD_OPTS to reflect expected behavior regarding fencing
-# and quorum.
+# When setting FENCE_JOIN to "no", it is important to also set
+# DLM_CONTROLD_OPTS="-f0" (at least) for correct operation.
+# Please note that clusters without fencing are not
+# supported by Red Hat except for MRG installations.
#FENCE_JOIN="yes"
# FENCED_OPTS -- allow extra options to be passed to fence daemon.
11 years, 8 months