cluster: STABLE3 - rgmanager: Honor restricted FDs during migrations

Lon Hohberger lon at fedoraproject.org
Thu Aug 5 20:29:48 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9a5de317a9bf9f9dfc57c6b98ed58a988978c94d
Commit:        9a5de317a9bf9f9dfc57c6b98ed58a988978c94d
Parent:        d49617f50929309b98e860f2b4b9ddfb60a80782
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Thu Aug 5 16:02:11 2010 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Thu Aug 5 16:28:42 2010 -0400

rgmanager: Honor restricted FDs during migrations

Rgmanager was ignoring restricted failover domain
rules when processing -M commands from clusvcadm.

Resolves: rhbz#621694

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/daemons/rg_state.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index d23772f..ee1b6eb 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -829,6 +829,11 @@ svc_migrate(const char *svcName, int target)
 		return RG_ENODE;
 	}
 
+	if (node_should_start_safe(target, membership, svcName) == FOD_ILLEGAL) {
+		free_member_list(membership);
+		return RG_EDEPEND;
+	}
+
 	count_resource_groups_local(m);
 	if (m->cn_svcexcl ||
 	    (m->cn_svccount && is_exclusive(svcName))) {


More information about the cluster-commits mailing list