Attachment 151701 Details for Bug 235178 – Fix fix

[patch] Fix fix

rgmanager-235178.patch (text/plain), 3.65 KB, created by Lon Hohberger on 2007-04-04 19:16:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2007-04-04 19:16:28 UTC

Size: 3.65 KB

patch

obsolete

>Index: src/daemons/resrules.c
>===================================================================
>RCS file: /cvs/cluster/cluster/rgmanager/src/daemons/resrules.c,v
>retrieving revision 1.9.2.7
>diff -u -r1.9.2.7 resrules.c
>--- src/daemons/resrules.c	20 Mar 2007 19:40:06 -0000	1.9.2.7
>+++ src/daemons/resrules.c	4 Apr 2007 19:14:20 -0000
>@@ -298,6 +298,7 @@
> 		acts[0].ra_depth = depth;
> 		acts[0].ra_timeout = timeout;
> 		acts[0].ra_interval = interval;
>+		acts[0].ra_last = 0;
> 		acts[1].ra_name = NULL;
> 
> 		*actsp = acts;
>@@ -321,6 +322,7 @@
> 				       (int)interval);
> 				acts[x].ra_interval = interval;
> 			}
>+			acts[x].ra_last = 0;
> 			printf("\n");
> 			replace = 1;
> 		}
>@@ -342,6 +344,7 @@
> 	acts[x].ra_depth = depth;
> 	acts[x].ra_timeout = timeout;
> 	acts[x].ra_interval = interval;
>+	acts[x].ra_last = 0;
> 
> 	acts[x+1].ra_name = NULL;
> 
>@@ -889,6 +892,10 @@
> 
> 		n = read(fd, buf, sizeof(buf));
> 		if (n < 0) {
>+
>+			if (errno == EINTR)
>+				continue;
>+
> 			if (*file)
> 				free(*file);
> 			return -1;
>Index: src/daemons/restree.c
>===================================================================
>RCS file: /cvs/cluster/cluster/rgmanager/src/daemons/restree.c,v
>retrieving revision 1.10.2.15
>diff -u -r1.10.2.15 restree.c
>--- src/daemons/restree.c	22 Mar 2007 23:15:58 -0000	1.10.2.15
>+++ src/daemons/restree.c	4 Apr 2007 19:14:21 -0000
>@@ -1062,25 +1062,39 @@
> 
> 	now = time(NULL);
> 
>-       for (; node->rn_actions[x].ra_name; x++) {
>+	for (; node->rn_actions[x].ra_name; x++) {
> 		if (!has_recover &&
>-                   !strcmp(node->rn_actions[x].ra_name, "recover")) {
>+		    !strcmp(node->rn_actions[x].ra_name, "recover")) {
> 			has_recover = 1;
> 			continue;
> 		}
> 
>-               if (strcmp(node->rn_actions[x].ra_name, "status"))
>+		if (strcmp(node->rn_actions[x].ra_name, "status"))
>+			continue;
>+
>+		/* If a status check has never been done, reset its status. */
>+		if (!node->rn_actions[x].ra_last) {
>+			node->rn_actions[x].ra_last = now;
> 			continue;
>+		}
>+
>+		delta = now - node->rn_actions[x].ra_last;
> 
>-               delta = now - node->rn_actions[x].ra_last;
>+		/*
>+		printf("%s:%s %s level %d interval = %d  elapsed = %d\n",
>+			node->rn_resource->r_rule->rr_type,
>+			node->rn_resource->r_attrs->ra_value,
>+			node->rn_actions[x].ra_name, node->rn_actions[x].ra_depth,
>+			(int)node->rn_actions[x].ra_interval, (int)delta);
>+		 */
> 
>-		/* Ok, it's a 'monitor' action. See if enough time has
>-		   elapsed for a given type of monitoring action */
>-               if (delta < node->rn_actions[x].ra_interval)
>+		/* Ok, it's a 'status' action. See if enough time has
>+		   elapsed for a given type of status action */
>+		if (delta < node->rn_actions[x].ra_interval)
> 			continue;
> 
> 		if (idx == -1 ||
>-                   node->rn_actions[x].ra_depth > node->rn_actions[idx].ra_depth)
>+		    node->rn_actions[x].ra_depth > node->rn_actions[idx].ra_depth)
> 			idx = x;
> 	}
> 
>@@ -1088,7 +1102,27 @@
> 	if (idx == -1)
> 		return 0;
> 
>-       node->rn_actions[idx].ra_last = now;
>+	/* Clear all check levels lower than us */
>+	for (x = 0; node->rn_actions[x].ra_name; x++) {
>+		if (x == idx) {
>+			node->rn_actions[idx].ra_last = now;
>+			continue;
>+		}
>+		if (strcmp(node->rn_actions[x].ra_name, "status"))
>+			continue;
>+
>+		if (node->rn_actions[x].ra_depth <
>+		    node->rn_actions[idx].ra_depth)
>+			node->rn_actions[x].ra_last = now;
>+	}
>+
>+	/*printf("-> %s:%s %s level %d interval = %d\n",
>+		node->rn_resource->r_rule->rr_type,
>+		node->rn_resource->r_attrs->ra_value,
>+		node->rn_actions[idx].ra_name,
>+		node->rn_actions[idx].ra_depth,
>+		(int)node->rn_actions[idx].ra_interval);*/
>+
> 	if ((x = res_exec(node, RS_STATUS,
>                          node->rn_actions[idx].ra_depth)) == 0)
> 		return 0;

Actions: View | Diff

Attachments on bug 235178: 151701