File pacemaker-pengine-stop-occur-after-stopped-remo... of Package pacemaker.8750

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-pengine-stop-occur-after-stopped-remote-connections-brought-up.patch of Package pacemaker.8750

commit b04b392925daa70af17f2abdef9a6198127c5608
Author: Andrew Beekhof <andrew@beekhof.net>
Date:   Fri Dec 8 13:53:36 2017 +1100

Fix: PE: Ensure stop operations occur after stopped remote connections have been brought up

Index: pacemaker-1.1.16+20170320.77ea74d/pengine/allocate.c
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/allocate.c
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/allocate.c
@@ -49,6 +49,24 @@ enum remote_connection_state
     remote_state_stopped = 4
 };
 
+static const char *
+state2text(enum remote_connection_state state)
+{
+    switch (state) {
+        case remote_state_unknown:
+            return "unknown";
+        case remote_state_alive:
+            return "alive";
+        case remote_state_resting:
+            return "resting";
+        case remote_state_failed:
+            return "failed";
+        case remote_state_stopped:
+            return "stopped";
+    }
+
+    return "impossible";
+}
 
 resource_alloc_functions_t resource_class_alloc_functions[] = {
     {
@@ -2010,10 +2028,10 @@ apply_remote_ordering(action_t *action,
         cluster_node = remote_rsc->running_on->data;
     }
 
-    crm_trace("Order %s action %s relative to %s%s (state %d)",
+    crm_trace("Order %s action %s relative to %s%s (state: %s)",
               action->task, action->uuid,
               is_set(remote_rsc->flags, pe_rsc_failed)? "failed " : "",
-              remote_rsc->id, state);
+              remote_rsc->id, state2text(state));
 
     if (safe_str_eq(action->task, CRMD_ACTION_MIGRATE)
         || safe_str_eq(action->task, CRMD_ACTION_MIGRATE)) {
@@ -2041,23 +2059,29 @@ apply_remote_ordering(action_t *action,
             /* Handle special case with remote node where stop actions need to be
              * ordered after the connection resource starts somewhere else.
              */
-            if(state == remote_state_resting) {
-                /* Wait for the connection resource to be up and assume everything is as we left it */
-                order_start_then_action(remote_rsc, action, pe_order_none,
-                                        data_set);
+            if(state == remote_state_alive) {
+                order_action_then_stop(action, remote_rsc,
+                                       pe_order_implies_first, data_set);
 
-            } else {
-                if(state == remote_state_failed) {
-                    /* We would only be here if the resource is
-                     * running on the remote node.  Since we have no
-                     * way to stop it, it is necessary to fence the
-                     * node.
-                     */
-                    pe_fence_node(data_set, action->node, "resources are active and the connection is unrecoverable");
-                }
+            } else if(state == remote_state_failed) {
+                /* We would only be here if the resource is
+                 * running on the remote node.  Since we have no
+                 * way to stop it, it is necessary to fence the
+                 * node.
+                 */
+                pe_fence_node(data_set, action->node, "resources are active and the connection is unrecoverable");
+                order_action_then_stop(action, remote_rsc,
+                                       pe_order_implies_first, data_set);
 
+            } else if(remote_rsc->next_role == RSC_ROLE_STOPPED) {
+                /* If its not coming back up, better do what we need first */
                 order_action_then_stop(action, remote_rsc,
                                        pe_order_implies_first, data_set);
+
+            } else {
+                /* Wait for the connection resource to be up and assume everything is as we left it */
+                order_start_then_action(remote_rsc, action, pe_order_none, data_set);
+
             }
             break;

Places

File pacemaker-pengine-stop-occur-after-stopped-remote-connections-brought-up.patch of Package pacemaker.8750

Places