cluster: STABLE32 - Revert "rgmanager: Fix for services stuck in recovery"

[Ryan McCabe]

Gitweb:       
http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=13b5aea8fb2...
Commit:        13b5aea8fb2fe7f7e59b049dc4c45e8777b2fbbb
Parent:        b17d6ffc82e75553cfee7c2fd21d3bbdac0d1e86
Author:        Ryan McCabe <rmccabe(a)redhat.com&gt;
AuthorDate:    Tue Oct 2 13:59:45 2012 -0400
Committer:     Ryan McCabe <rmccabe(a)redhat.com&gt;
CommitterDate: Tue Oct 2 13:59:45 2012 -0400

Revert "rgmanager: Fix for services stuck in recovery"

This reverts commit 03e2215bd277fd79b8a6ee70a49de711e0f343ad.

Commit b17d6ffc82e75553cfee7c2fd21d3bbdac0d1e86 contains a better fix
for the problem this was trying to solve.

Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com&gt;
---
 rgmanager/src/daemons/groups.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c
index 0caa33e..4a22dca 100644
--- a/rgmanager/src/daemons/groups.c
+++ b/rgmanager/src/daemons/groups.c
@@ -736,8 +736,7 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus)
 		    (svcStatus.rs_state == RG_STATE_STARTED ||
 		     svcStatus.rs_state == RG_STATE_RECOVER ||
 		     svcStatus.rs_state == RG_STATE_STARTING ||
-		     svcStatus.rs_state == RG_STATE_STOPPING ||
-		     svcStatus.rs_state == RG_STATE_ERROR)) {
+		     svcStatus.rs_state == RG_STATE_STOPPING )) {
 
 			logt_print(LOG_DEBUG,
 				   "Marking %s on down member %d as stopped",
@@ -779,8 +778,7 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus)
 		/* Disabled/failed/in recovery?  Do nothing */
 		if ((svcStatus.rs_state == RG_STATE_DISABLED) ||
 		    (svcStatus.rs_state == RG_STATE_FAILED) ||
-		    (svcStatus.rs_state == RG_STATE_RECOVER) || 
-		    (svcStatus.rs_state == RG_STATE_ERROR)) {
+		    (svcStatus.rs_state == RG_STATE_RECOVER)) {
 			continue;
 		}