[Cluster-devel] [PATCH 1/2] config: update relax ng schema to include totem miss_count_const

[Cluster-devel] [PATCH 1/2] config: update relax ng schema to include totem miss_count_const

[Fabio M. Di Nitto]

From: "Fabio M. Di Nitto" <fdinitto@redhat.com>

Resolves: rhbz#804938

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 config/tools/xml/cluster.rng.in.head |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/config/tools/xml/cluster.rng.in.head b/config/tools/xml/cluster.rng.in.head
index c2fed3e..4e3d901 100644
--- a/config/tools/xml/cluster.rng.in.head
+++ b/config/tools/xml/cluster.rng.in.head
@@ -255,6 +255,15 @@ To validate your cluster.conf against this schema, run:
       calculated from retransmits_before_loss and token." rha:default="4"
       rha:sample="5"/>
    </optional>
+   <optional>
+    <attribute name="miss_count_const"
+      rha:description="This constant defines the maximum number of times
+      on receipt of a token a message is checked for retransmission before
+      retransmission occurs. This parameter is useful to modify for switches
+      that delay multicast packets compared to unicast packets.
+      The default setting works well for nearly all modern switches."
+      rha:default="5" rha:sample="10"/>
+   </optional>
    <!-- FIXME: The following description was adapted from the man page.
    It may be tool long for the schema document. Consider cutting text
    after the second sentence and referring the reader to the openais.conf
-- 
1.7.7.6

[Cluster-devel] [PATCH 2/2] cman init: fix start sequence error handling

[Fabio M. Di Nitto]

From: "Fabio M. Di Nitto" <fdinitto@redhat.com>

Any daemon that fails to start would leave no traces.

the problem with cman init is that we need to handle multiple daemons
and tools. If one in the chain fails, we never reverted to the original
state of the system. This can indeed cause other issues.

Fix the init script to "stop" cman if any error happens during "start.

Resolves: rhbz#806002

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 cman/init.d/cman.in |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index d0c6f70..a39f19f 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -19,6 +19,9 @@
 # set secure PATH
 PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
 
+# save invokation for rollback ops
+thisinvokation="$0"
+
 chkconfig2()
 {
 	case "$1" in
@@ -199,6 +202,9 @@ nok() {
 	echo -e "$errmsg"
 	failure
 	echo
+	if [ "$currentaction" = "start" ]; then
+		$thisinvokation stop
+	fi
 	exit 1
 }
 
@@ -744,6 +750,7 @@ leave_fence_domain()
 
 start()
 {
+	currentaction="start"
 	breakpoint="$1"
 
 	sshd_enabled && cd @INITDDIR@ && ./sshd start
-- 
1.7.7.6

[Cluster-devel] [PATCH 1/2] config: update relax ng schema to include totem miss_count_const

[Christine Caulfield]

ACK

Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>


On 30/03/12 09:07, Fabio M. Di Nitto wrote:
> From: "Fabio M. Di Nitto"<fdinitto@redhat.com>
>
> Resolves: rhbz#804938
>
> Signed-off-by: Fabio M. Di Nitto<fdinitto@redhat.com>
> ---
>   config/tools/xml/cluster.rng.in.head |    9 +++++++++
>   1 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/config/tools/xml/cluster.rng.in.head b/config/tools/xml/cluster.rng.in.head
> index c2fed3e..4e3d901 100644
> --- a/config/tools/xml/cluster.rng.in.head
> +++ b/config/tools/xml/cluster.rng.in.head
> @@ -255,6 +255,15 @@ To validate your cluster.conf against this schema, run:
>         calculated from retransmits_before_loss and token." rha:default="4"
>         rha:sample="5"/>
>      </optional>
> +<optional>
> +<attribute name="miss_count_const"
> +      rha:description="This constant defines the maximum number of times
> +      on receipt of a token a message is checked for retransmission before
> +      retransmission occurs. This parameter is useful to modify for switches
> +      that delay multicast packets compared to unicast packets.
> +      The default setting works well for nearly all modern switches."
> +      rha:default="5" rha:sample="10"/>
> +</optional>
>      <!-- FIXME: The following description was adapted from the man page.
>      It may be tool long for the schema document. Consider cutting text
>      after the second sentence and referring the reader to the openais.conf

[Cluster-devel] [PATCH 2/2] cman init: fix start sequence error handling

[Christine Caulfield]

ACK

Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>

On 30/03/12 09:07, Fabio M. Di Nitto wrote:
> From: "Fabio M. Di Nitto"<fdinitto@redhat.com>
>
> Any daemon that fails to start would leave no traces.
>
> the problem with cman init is that we need to handle multiple daemons
> and tools. If one in the chain fails, we never reverted to the original
> state of the system. This can indeed cause other issues.
>
> Fix the init script to "stop" cman if any error happens during "start.
>
> Resolves: rhbz#806002
>
> Signed-off-by: Fabio M. Di Nitto<fdinitto@redhat.com>
> ---
>   cman/init.d/cman.in |    7 +++++++
>   1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
> index d0c6f70..a39f19f 100644
> --- a/cman/init.d/cman.in
> +++ b/cman/init.d/cman.in
> @@ -19,6 +19,9 @@
>   # set secure PATH
>   PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
>
> +# save invokation for rollback ops
> +thisinvokation="$0"
> +
>   chkconfig2()
>   {
>   	case "$1" in
> @@ -199,6 +202,9 @@ nok() {
>   	echo -e "$errmsg"
>   	failure
>   	echo
> +	if [ "$currentaction" = "start" ]; then
> +		$thisinvokation stop
> +	fi
>   	exit 1
>   }
>
> @@ -744,6 +750,7 @@ leave_fence_domain()
>
>   start()
>   {
> +	currentaction="start"
>   	breakpoint="$1"
>
>   	sshd_enabled&&  cd @INITDDIR@&&  ./sshd start