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