Gitweb:
http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=432045a49e4...
Commit: 432045a49e4930e6f1c406f6f279c608655dac04
Parent: 321427f22fba4a073e814db3468ade553d6dac24
Author: Ryan McCabe <rmccabe(a)redhat.com>
AuthorDate: Tue Oct 2 11:42:15 2012 -0400
Committer: Ryan McCabe <rmccabe(a)redhat.com>
CommitterDate: Tue Oct 2 11:42:15 2012 -0400
Revert "rgmanager: Fix for services stuck in recovery"
This reverts commit 467d015c53e5e2d00025708cda95b3df41ebda1f.
The patch in commit 321427f22fba4a073e814db3468ade553d6dac24 better
solves the issue this patch tried to address.
Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com>
---
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 bd406c8..20ed2e1 100644
--- a/rgmanager/src/daemons/groups.c
+++ b/rgmanager/src/daemons/groups.c
@@ -747,8 +747,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 )) {
clulog(LOG_DEBUG,
"Marking %s on down member %d as stopped",
@@ -790,8 +789,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;
}