commit a5bc09d20ea41afe42bbda037d5e8ecb74f2bb15 Author: Andrew Beekhof Date: Fri Apr 11 07:39:59 2014 +1000 Fix: PE: Unfencing is based on device probes, there is no need to unfence when normal resources are found active (cherry picked from commit 7aad7cb9a5a1778dbc13ed56f976086e0393a7e3) diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c index eb10bd8..363e2bc 100644 --- a/lib/pengine/unpack.c +++ b/lib/pengine/unpack.c @@ -2329,17 +2329,8 @@ unpack_rsc_op(resource_t * rsc, node_t * node, xmlNode * xml_op, if (is_probe && target_rc == 7) { task_status_i = PCMK_LRM_OP_DONE; set_bit(rsc->flags, pe_rsc_unexpectedly_running); - - if(is_set(rsc->flags, pe_rsc_needs_unfencing)) { - /* _Require_ unfencing after probing resources that need unfencing and was found active */ - crm_warn("Operation %s found resource %s active on %s: triggering unfencing", - task, rsc->id, node->details->uname); - trigger_unfencing(NULL, node, "Unexpected state", NULL, data_set); - - } else { - pe_rsc_info(rsc, "Operation %s found resource %s active on %s", - task, rsc->id, node->details->uname); - } + pe_rsc_info(rsc, "Operation %s found resource %s active on %s", + task, rsc->id, node->details->uname); /* legacy code for pre-0.6.5 operations */ } else if (target_rc < 0 && interval > 0 && rsc->role == RSC_ROLE_MASTER) {