Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=296... Commit: 2960cc2fe8ae35824e570fb774feb4b8386d982e Parent: 9e0190a646d7ab7236969d77d5621c19d5566366 Author: Shane Bradley sbradley@redhat.com AuthorDate: Wed Jan 26 10:05:27 2011 -0500 Committer: Lon Hohberger lhh@redhat.com CommitterDate: Mon Jan 31 17:27:35 2011 -0500

rgmanager: Fix nofailback when service is in 'starting' state

If a failover domain has "nofailback" enabled a service that is "starting" state would still failback to the original. If a service takes a while to come up and is in the "starting" state and the original node comes back online while it is in that state the service will be failed back.

Resolves: rhbz#672841

Signed-off-by: Shane Bradley sbradley@redhat.com Signed-off-by: Lon Hohberger lhh@redhat.com Tested-by: Toure Dunnon tdunnon@redhat.com --- rgmanager/src/daemons/fo_domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/daemons/fo_domain.c b/rgmanager/src/daemons/fo_domain.c index 0448e0d..638dde9 100644 --- a/rgmanager/src/daemons/fo_domain.c +++ b/rgmanager/src/daemons/fo_domain.c @@ -529,7 +529,7 @@ node_should_start(int nodeid, cluster_member_list_t *membership, * Check to see if the service is started and if we are the owner in case of * restricted+owner+no failback */ - if (svc_state.rs_state == RG_STATE_STARTED) + if (svc_state.rs_state == RG_STATE_STARTED || svc_state.rs_state == RG_STATE_STARTING) started = 1; if (svc_state.rs_owner == (uint32_t)nodeid) owned_by_node = 1;