Attachment 522068 Details for Bug 735912 – new patch

[patch] new patch

bz735912.diff (text/plain), 3.25 KB, created by Fabio Massimo Di Nitto on 2011-09-08 09:18:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabio Massimo Di Nitto

Created: 2011-09-08 09:18:48 UTC

Size: 3.25 KB

patch

obsolete

>diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
>index 64f505f..d5e7a92 100644
>--- a/cman/daemon/cman-preconfig.c
>+++ b/cman/daemon/cman-preconfig.c
>@@ -393,13 +393,14 @@ static uint16_t generate_cluster_id(char *name)
> 	return value & 0xFFFF;
> }
> 
>-static char *default_mcast(char *node, uint16_t clusterid)
>+static char *default_mcast(char *node, int altiface)
> {
>         struct addrinfo *ainfo;
>         struct addrinfo ahints;
> 	int ret;
> 	int family;
> 	static char addr[132];
>+	uint16_t clusterid = cluster_id + altiface;
> 
>         memset(&ahints, 0, sizeof(ahints));
> 
>@@ -691,7 +692,7 @@ static int get_nodename(struct objdb_iface_ver0 *objdb)
> 		}
> 
> 		if (!mcast_name) {
>-			mcast_name = default_mcast(nodename, cluster_id);
>+			mcast_name = default_mcast(nodename, PRIMARY_IFACE);
> 
> 		}
> 		if (!mcast_name)
>@@ -778,7 +779,7 @@ static int get_nodename(struct objdb_iface_ver0 *objdb)
> 		objdb_get_int(objdb, alt_object, "ttl", &altttl, ttl);
> 
> 		if (objdb_get_string(objdb, alt_object, "mcast", &mcast)) {
>-			mcast = mcast_name;
>+			mcast = default_mcast(nodename, ALT_IFACE);
> 		}
> 
> 		if (add_ifaddr(objdb, mcast, node, portnum, altttl,
>@@ -992,6 +993,13 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
> 			}
> 		}
> 
>+		if (objdb_get_string(objdb, object_handle, "rrp_problem_count_threshold", &value)) {
>+			if (num_interfaces > 1) {
>+				objdb->object_key_create_typed(object_handle, "rrp_problem_count_threshold",
>+							       "3", 2, OBJDB_VALUETYPE_STRING);
>+			}
>+		}
>+
> 		if (objdb_get_string(objdb, object_handle, "secauth", &value)) {
> 			sprintf(tmp, "%d", 1);
> 			objdb->object_key_create_typed(object_handle, "secauth",
>@@ -1136,7 +1144,7 @@ static int set_noccs_defaults(struct objdb_iface_ver0 *objdb)
> 	num_nodenames = 1;
> 
> 	if (!mcast_name) {
>-		mcast_name = default_mcast(nodename, cluster_id);
>+		mcast_name = default_mcast(nodename, PRIMARY_IFACE);
> 	}
> 
> 	/* This will increase as nodes join the cluster */
>diff --git a/config/tools/xml/cluster.rng.in.head b/config/tools/xml/cluster.rng.in.head
>index 1afa9e8..5d23ab2 100644
>--- a/config/tools/xml/cluster.rng.in.head
>+++ b/config/tools/xml/cluster.rng.in.head
>@@ -257,7 +257,7 @@ To validate your cluster.conf against this schema, run:
>       rha:sample="5"/>
>    </optional>
>    
>    <optional>
>@@ -275,6 +275,13 @@ 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."
>+        rha:default="10" rha:sample="5"/>
>+   </optional>
>+   <optional>
>     <attribute name="secauth" rha:description="This attribute specifies
>        that HMAC/SHA1 authentication should be used to authenticate all
>        messages. It further specifies that all data should be encrypted

Actions: View | Diff

Attachments on bug 735912: 522060 | 522068