cluster: STABLE3 - rgmanager: Fix resource start/check times

Lon Hohberger lon at fedoraproject.org
Tue May 4 20:24:11 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9e62d21fe1f216b97aa0ca39df400cef19062034
Commit:        9e62d21fe1f216b97aa0ca39df400cef19062034
Parent:        4a66dd6aa8e60fc03b027c1fbdbfd37681878954
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Tue May 4 14:58:58 2010 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Tue May 4 14:58:58 2010 -0400

rgmanager: Fix resource start/check times

Resolves: bz#588890

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/include/reslist.h     |    1 -
 rgmanager/src/daemons/restree.c |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h
index 382dfae..6f0724b 100644
--- a/rgmanager/include/reslist.h
+++ b/rgmanager/include/reslist.h
@@ -97,7 +97,6 @@ typedef struct _resource {
 	char *	r_name;
 	resource_attr_t *	r_attrs;
 	resource_act_t *	r_actions;
-	time_t	r_started;	/** Time this resource was last started */
 	int	r_flags;
 	int	r_refs;
 	int	r_incarnations;	/** Number of instances running locally */
diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c
index f0e57d7..ebeb79e 100644
--- a/rgmanager/src/daemons/restree.c
+++ b/rgmanager/src/daemons/restree.c
@@ -1212,7 +1212,7 @@ clear_checks(resource_node_t *node)
 	int x = 0;
 	resource_t *res = node->rn_resource;
 
-	now = res->r_started;
+	now = get_time("start", 0, node);
 
 	for (; node->rn_actions[x].ra_name; x++) {
 


More information about the cluster-commits mailing list