[Cluster-devel] cluster/rgmanager ChangeLog src/daemons/rg_state.c
| Newsgroups | com.redhat.cluster-devel |
|---|---|
| Message-ID | <[email protected]> |
CVSROOT: /cvs/cluster Module name: cluster Branch: RHEL5 Changes by: lhh at sourceware.org 2008-01-25 18:09:24 Modified files: rgmanager : ChangeLog rgmanager/src/daemons: rg_state.c Log message: Fix 430272 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.31.2.35&r2=1.31.2.36 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/rg_state.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.24.2.16&r2=1.24.2.17 --- cluster/rgmanager/ChangeLog 2007/12/19 21:34:02 1.31.2.35 +++ cluster/rgmanager/ChangeLog 2008/01/25 18:09:24 1.31.2.36 @@ -1,3 +1,8 @@ +2008-01-25 Lon Hohberger <[email protected]> + * src/daemons/rg_thread.c: Fix case that broke 'clusvcadm -e <service> + -n <node>' case #430220 + * src/daemons/rg_state.c: Don't enable migrate-to-self (#430272) + 2007-12-19 Lon Hohberger <[email protected]> * include/res-ocf.h: Fix typo * src/daemons/restree.c: Export reference counts to resource agents. --- cluster/rgmanager/src/daemons/rg_state.c 2008/01/16 18:50:29 1.24.2.16 +++ cluster/rgmanager/src/daemons/rg_state.c 2008/01/25 18:09:24 1.24.2.17 @@ -885,6 +885,12 @@ return RG_EFAIL; } + if (svcStatus.rs_owner == target) { + rg_unlock(&lockp); + /* Do not allow migration to its current owner! */ + return 0; + } + if (svcStatus.rs_owner != my_id()) { rg_unlock(&lockp); return RG_EFORWARD;