cluster: STABLE3 - rgmanager: Make relocate-to-offline consistent

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: 369493ab6772a1d2f657f964ea72f2d8bb3ea854 Parent: d1e2d3b644b09c2a47f47775910e61b5ee5abf5c Author: Lon Hohberger <lhh(a)redhat.com&gt; AuthorDate: Wed Feb 10 14:12:40 2010 -0500 Committer: Lon Hohberger <lhh(a)redhat.com&gt; CommitterDate: Wed Feb 10 17:55:04 2010 -0500 rgmanager: Make relocate-to-offline consistent Relocating (note: not migrating) a service is supposed to try other hosts if the specified target is offline. This works correctly when central_processing is enabled, but not in standard mode. This patch fixes the errant behavior. Resolves: rhbz#536157 Signed-off-by: Lon Hohberger <lhh(a)redhat.com&gt; --- rgmanager/src/daemons/rg_state.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 029100e..d9f02b3 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -1669,18 +1669,17 @@ handle_relocate_req(char *svcName, int orig_request, int preferred_target, /* TODO: simplify this and don't keep alloc/freeing member lists */ allowed_nodes = member_list(); - /* Avoid even bothering the other node if we can */ - m = memb_id_to_p(allowed_nodes, preferred_target); - if (!m) { - free_member_list(allowed_nodes); - return RG_EINVAL; - } - count_resource_groups_local(m); - if (m->cn_svcexcl || - (m->cn_svccount && is_exclusive(svcName))) { - free_member_list(allowed_nodes); - return RG_EDEPEND; + m = memb_id_to_p(allowed_nodes, preferred_target); + if (m && m->cn_member) { + count_resource_groups_local(m); + if (m->cn_svcexcl || + (m->cn_svccount && is_exclusive(svcName))) { + free_member_list(allowed_nodes); + return RG_EDEPEND; + } + } else { + target = preferred_target = -1; } free_member_list(allowed_nodes); }