Skip to contentSkip to conversation

rgmanager: OCF_NOT_INSTALLED is OK if we stop when stopped (RHEL5)

PATCH New Lon Hohberger 1 participant 2 messages Jan 4, 2012

lore
Share & tools
lore

Lon Hohberger

author
#0 lore raw

PATCH 1/1 rgmanager: OCF_NOT_INSTALLED is OK if we stop when stopped (RHEL5)

Scripts often live in file systems which are mounted by rgmanager. This patch makes rgmanager ignore the OCF_NOT_INSTALLED error returned from the script agent if we attempt to stop when a start failed.

Furthermore, don't mark the resource as failed if a start failure occurs due to the program not existing.

The combination of these create the ability for a missing script to move to a node where the script exists, or be placed in to the stopped state.

Resolves: rhbz#768146

Signed-off-by Lon Hohberger <[email protected]>
Reviewed-by Adam Drew <[email protected]>
Tested-by Adam Drew <[email protected]>
---
 rgmanager/src/daemons/restree.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
rgmanager/src/daemons/restree.c +6 -1
index 697c7b1..367fbb3 100644
@@ -519,6 +519,10 @@ res_exec(resource_node_t *node, int op, const char *arg, int depth)
 
 		ret = WEXITSTATUS(ret);
 
+		if (node->rn_state == RES_STOPPED &&
+		    op == RS_STOP && ret == OCF_RA_NOT_INSTALLED)
+			ret = 0;
+
 #ifndef NO_CCS
 		if ((op == RS_STATUS &&
 		     node->rn_state == RES_STARTED && ret) ||

@@ -1523,7 +1527,8 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree,
 		}
 		node->rn_flags &= ~(RF_NEEDSTART | RF_RECONFIG);
 		if (rv != 0) {
-			node->rn_state = RES_FAILED;
+			if (rv != OCF_RA_NOT_INSTALLED)
+				node->rn_state = RES_FAILED;
 			pthread_mutex_unlock(&node->rn_resource->r_mutex);
 			return SFL_FAILURE;
 		}
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 1/1 rgmanager: OCF_NOT_INSTALLED is OK if we stop when stopped (RHEL5)

Quoted 4 lines · Lon Hohberger

Scripts often live in file systems which are mounted by rgmanager. This patch makes rgmanager ignore the OCF_NOT_INSTALLED error returned from the script agent if we attempt to stop when a start failed.

(Note that Adam already reviewed this off-list)

-- Lon