Merge pull request #1073 from kgaillot/1.1

Handle unrunnable clones correctly

extra/alerts/alert_file.sh.sample

@@ -33,8 +33,19 @@
 #   </alerts>
 # </configuration>
 
+# No one will probably ever see this echo, unless they run the script manually.
+# An alternative would be to log to the system log, or similar. (We can't send
+# this to the configured recipient, because that variable won't be defined in
+# this case either.)
 if [ -z $CRM_alert_version ]; then
-    echo "Pacemaker version 1.1.15 or later is required" >> "${CRM_alert_recipient}"
+    echo "$0 must be run by Pacemaker version 1.1.15 or later"
+    exit 0
+fi
+
+# Alert agents must always handle the case where no recipients are defined,
+# even if it's a no-op (a recipient might be added to the configuration later).
+if [ -z "${CRM_alert_recipient}" ]; then
+    echo "$0 requires a recipient configured with a full filename path"
     exit 0
 fi
 

extra/alerts/alert_snmp.sh.sample

@@ -43,7 +43,12 @@
 # ================================
 
 if [ -z "$CRM_alert_version" ]; then
-    echo "Pacemaker version 1.1.15 or later is required"
+    echo "$0 must be run by Pacemaker version 1.1.15 or later"
+    exit 0
+fi
+
+if [ -z "$CRM_alert_recipient" ]; then
+    echo "$0 requires a recipient configured with the SNMP server IP address"
     exit 0
 fi
 

pengine/clone.c

@@ -927,22 +927,29 @@ clone_internal_constraints(resource_t * rsc, pe_working_set_t * data_set)
     }
 }
 
-static void
+static bool
 assign_node(resource_t * rsc, node_t * node, gboolean force)
 {
+    bool changed = FALSE;
+
     if (rsc->children) {
 
         GListPtr gIter = rsc->children;
 
         for (; gIter != NULL; gIter = gIter->next) {
             resource_t *child_rsc = (resource_t *) gIter->data;
 
-            native_assign_node(child_rsc, NULL, node, force);
+            changed |= native_assign_node(child_rsc, NULL, node, force);
         }
 
-        return;
+        return changed;
+    }
+    if (rsc->allocated_to != NULL) {
+        changed = true;
     }
+
     native_assign_node(rsc, NULL, node, force);
+    return changed;
 }
 
 static resource_t *
@@ -1264,8 +1271,9 @@ clone_update_actions_interleave(action_t * first, action_t * then, node_t * node
              */
             if (type & (pe_order_runnable_left | pe_order_implies_then) /* Mandatory */ ) {
                 pe_rsc_info(then->rsc, "Inhibiting %s from being active", then_child->id);
-                assign_node(then_child, NULL, TRUE);
-                /* TODO - set changed correctly? */
+                if(assign_node(then_child, NULL, TRUE)) {
+                    changed |= pe_graph_updated_then;
+                }
             }
 
         } else {

pengine/regression.sh

@@ -484,6 +484,7 @@ do_test 1360 "OSDL #1360 - Clone stickiness"
 do_test 1484 "OSDL #1484 - on_fail=stop"
 do_test 1494 "OSDL #1494 - Clone stability"
 do_test unrunnable-1 "Unrunnable"
+do_test unrunnable-2 "Unrunnable 2"
 do_test stonith-0 "Stonith loop - 1"
 do_test stonith-1 "Stonith loop - 2"
 do_test stonith-2 "Stonith loop - 3"

pengine/test10/unrunnable-2.exp

@@ -0,0 +1 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0"/>

pengine/test10/unrunnable-2.summary

@@ -0,0 +1,175 @@
+6 of 117 resources DISABLED and 0 BLOCKED from being started due to failures
+
+Current cluster status:
+Online: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+
+ ip-192.0.2.12	(ocf::heartbeat:IPaddr2):	Started overcloud-controller-0 
+ Clone Set: haproxy-clone [haproxy]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Master/Slave Set: galera-master [galera]
+     Masters: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: memcached-clone [memcached]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: rabbitmq-clone [rabbitmq]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-core-clone [openstack-core]
+     Stopped (disabled): [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Master/Slave Set: redis-master [redis]
+     Masters: [ overcloud-controller-1 ]
+     Slaves: [ overcloud-controller-0 overcloud-controller-2 ]
+ ip-192.0.2.11	(ocf::heartbeat:IPaddr2):	Started overcloud-controller-1 
+ Clone Set: mongod-clone [mongod]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-aodh-evaluator-clone [openstack-aodh-evaluator]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-nova-scheduler-clone [openstack-nova-scheduler]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-l3-agent-clone [neutron-l3-agent]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-netns-cleanup-clone [neutron-netns-cleanup]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-ovs-cleanup-clone [neutron-ovs-cleanup]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ openstack-cinder-volume	(systemd:openstack-cinder-volume):	Stopped 
+ Clone Set: openstack-heat-engine-clone [openstack-heat-engine]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-ceilometer-api-clone [openstack-ceilometer-api]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-aodh-listener-clone [openstack-aodh-listener]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-metadata-agent-clone [neutron-metadata-agent]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-aodh-notifier-clone [openstack-aodh-notifier]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-heat-api-clone [openstack-heat-api]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-ceilometer-collector-clone [openstack-ceilometer-collector]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-glance-api-clone [openstack-glance-api]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-cinder-scheduler-clone [openstack-cinder-scheduler]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-nova-api-clone [openstack-nova-api]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-nova-consoleauth-clone [openstack-nova-consoleauth]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-sahara-api-clone [openstack-sahara-api]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-heat-api-cloudwatch-clone [openstack-heat-api-cloudwatch]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-sahara-engine-clone [openstack-sahara-engine]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-glance-registry-clone [openstack-glance-registry]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-ceilometer-notification-clone [openstack-ceilometer-notification]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-cinder-api-clone [openstack-cinder-api]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-dhcp-agent-clone [neutron-dhcp-agent]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-openvswitch-agent-clone [neutron-openvswitch-agent]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-nova-novncproxy-clone [openstack-nova-novncproxy]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: delay-clone [delay]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-server-clone [neutron-server]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-ceilometer-central-clone [openstack-ceilometer-central]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: httpd-clone [httpd]
+     Stopped (disabled): [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-heat-api-cfn-clone [openstack-heat-api-cfn]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-nova-conductor-clone [openstack-nova-conductor]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+
+Transition Summary:
+ * Start   openstack-cinder-volume	(overcloud-controller-2 - blocked)
+
+Executing cluster transition:
+
+Revised cluster status:
+Online: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+
+ ip-192.0.2.12	(ocf::heartbeat:IPaddr2):	Started overcloud-controller-0 
+ Clone Set: haproxy-clone [haproxy]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Master/Slave Set: galera-master [galera]
+     Masters: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: memcached-clone [memcached]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: rabbitmq-clone [rabbitmq]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-core-clone [openstack-core]
+     Stopped (disabled): [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Master/Slave Set: redis-master [redis]
+     Masters: [ overcloud-controller-1 ]
+     Slaves: [ overcloud-controller-0 overcloud-controller-2 ]
+ ip-192.0.2.11	(ocf::heartbeat:IPaddr2):	Started overcloud-controller-1 
+ Clone Set: mongod-clone [mongod]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-aodh-evaluator-clone [openstack-aodh-evaluator]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-nova-scheduler-clone [openstack-nova-scheduler]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-l3-agent-clone [neutron-l3-agent]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-netns-cleanup-clone [neutron-netns-cleanup]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-ovs-cleanup-clone [neutron-ovs-cleanup]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ openstack-cinder-volume	(systemd:openstack-cinder-volume):	Stopped 
+ Clone Set: openstack-heat-engine-clone [openstack-heat-engine]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-ceilometer-api-clone [openstack-ceilometer-api]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-aodh-listener-clone [openstack-aodh-listener]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-metadata-agent-clone [neutron-metadata-agent]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-aodh-notifier-clone [openstack-aodh-notifier]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-heat-api-clone [openstack-heat-api]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-ceilometer-collector-clone [openstack-ceilometer-collector]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-glance-api-clone [openstack-glance-api]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-cinder-scheduler-clone [openstack-cinder-scheduler]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-nova-api-clone [openstack-nova-api]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-nova-consoleauth-clone [openstack-nova-consoleauth]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-sahara-api-clone [openstack-sahara-api]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-heat-api-cloudwatch-clone [openstack-heat-api-cloudwatch]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-sahara-engine-clone [openstack-sahara-engine]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-glance-registry-clone [openstack-glance-registry]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-ceilometer-notification-clone [openstack-ceilometer-notification]
+     Started: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-cinder-api-clone [openstack-cinder-api]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-dhcp-agent-clone [neutron-dhcp-agent]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-openvswitch-agent-clone [neutron-openvswitch-agent]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-nova-novncproxy-clone [openstack-nova-novncproxy]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: delay-clone [delay]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: neutron-server-clone [neutron-server]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-ceilometer-central-clone [openstack-ceilometer-central]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: httpd-clone [httpd]
+     Stopped (disabled): [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-heat-api-cfn-clone [openstack-heat-api-cfn]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+ Clone Set: openstack-nova-conductor-clone [openstack-nova-conductor]
+     Stopped: [ overcloud-controller-0 overcloud-controller-1 overcloud-controller-2 ]
+