From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22234 invoked by alias); 9 Jul 2009 16:47:54 -0000 Received: (qmail 22228 invoked by alias); 9 Jul 2009 16:47:54 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: rgmanager: master - rgmanager: Don't allow migrate of frozen services To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: rgmanager.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 0bfff9e9bec649f4947ef4b9a164ffdd9ecce0f9 X-Git-Newrev: 202c45ed9d52bb5e3e13920b548790fe02c5c044 From: Lon Hohberger Message-Id: <20090709164726.072571201FE@lists.fedorahosted.org> Date: Thu, 09 Jul 2009 16:47:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00033.txt.bz2 Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=202c45ed9d52bb5e3e13920b548790fe02c5c044 Commit: 202c45ed9d52bb5e3e13920b548790fe02c5c044 Parent: 0bfff9e9bec649f4947ef4b9a164ffdd9ecce0f9 Author: Lon Hohberger AuthorDate: Thu Jul 9 11:04:35 2009 -0400 Committer: Lon Hohberger CommitterDate: Thu Jul 9 12:47:01 2009 -0400 rgmanager: Don't allow migrate of frozen services Resolves: Red Hat Bugzilla #510017 Signed-off-by: Lon Hohberger --- 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 7eea6ba..45981db 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -873,6 +873,11 @@ svc_migrate(const char *svcName, int target) return RG_EFAIL; } + if (svcStatus.rs_flags & RG_FLAG_FROZEN) { + rg_unlock(&lockp); + return RG_EFROZEN; + } + /* LOCK HELD */ svcStatus.rs_owner = target; svcStatus.rs_last_owner = my_id();