Accepting request 185885 from home:yan_gao:branches:network:ha-clustering:Factory

- crmd: Don't add node_state to cib, if we have not seen or fenced this node yet
- PE: Do not allow colocation with blocked clone instances
- PE: Do not re-allocate clone instances that are blocked in the Stopped state
- fence_legacy: stonithd now handles killing the process group for us
- Fencing: On timeout, clean up the agent's entire process group
- fencing: Put all fencing agent processes into their own process group
- crmd: Prevent crash by passing log arguments in the correct order
- PE: Do not restart resources that depend on unmanaged resources
- crmd: Prevent recurring monitors being cancelled due to notify operations
- mcp: Fix so that only pacemakerd restarts, at the time of pacemakerd failure
- mcp: Support PCMK_fail_fast to reboot a machine at the time of process (subsystem) failure
- cpg: Ensure the CPG group is always null-terminated
- Upstream version cs: ac7aa1c94f317fc1d4024fbc09b012bc9f1b229e

OBS-URL: https://build.opensuse.org/request/show/185885
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=50

bug-728579_pacemaker-stonith-dev-id.patch

@@ -8,7 +8,7 @@ Index: pacemaker/fencing/commands.c
 ===================================================================
 --- pacemaker.orig/fencing/commands.c
 +++ pacemaker/fencing/commands.c
-@@ -596,6 +596,7 @@ build_device_from_xml(xmlNode * msg)
+@@ -608,6 +608,7 @@ build_device_from_xml(xmlNode * msg)
                   device->id, device->on_target_actions);
      }
  
@@ -28,7 +28,7 @@ Index: pacemaker/lib/fencing/st_client.c
      int timeout;
      int async;
      void *userdata;
-@@ -546,6 +547,7 @@ stonith_action_destroy(stonith_action_t
+@@ -559,6 +560,7 @@ stonith_action_destroy(stonith_action_t
      free(action->args);
      free(action->action);
      free(action->victim);
@@ -36,7 +36,7 @@ Index: pacemaker/lib/fencing/st_client.c
      free(action);
  }
  
-@@ -573,6 +575,8 @@ stonith_action_create(const char *agent,
+@@ -586,6 +588,8 @@ stonith_action_create(const char *agent,
      if (device_args) {
          char buffer[512];
          const char *value = NULL;
@@ -45,7 +45,7 @@ Index: pacemaker/lib/fencing/st_client.c
  
          snprintf(buffer, 511, "pcmk_%s_retries", _action);
          value = g_hash_table_lookup(device_args, buffer);
-@@ -580,6 +584,11 @@ stonith_action_create(const char *agent,
+@@ -593,6 +597,11 @@ stonith_action_create(const char *agent,
          if (value) {
              action->max_retries = atoi(value);
          }
@@ -57,15 +57,16 @@ Index: pacemaker/lib/fencing/st_client.c
      }
  
      return action;
-@@ -731,6 +740,7 @@ internal_stonith_action_execute(stonith_
+@@ -745,6 +754,8 @@ internal_stonith_action_execute(stonith_
  
      if (!pid) {
          /* child */
 +        const char *st_dev_id_key = CRM_META "_" F_STONITH_DEVICE;
++
+         setpgid(0, 0);
  
          close(1);
-         /* coverity[leaked_handle] False positive */
-@@ -750,6 +760,10 @@ internal_stonith_action_execute(stonith_
+@@ -765,6 +776,10 @@ internal_stonith_action_execute(stonith_
          close(p_read_fd);
          close(p_write_fd);
  

pacemaker.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Aug  5 06:04:07 UTC 2013 - ygao@suse.com
+
+- crmd: Don't add node_state to cib, if we have not seen or fenced this node yet
+- PE: Do not allow colocation with blocked clone instances
+- PE: Do not re-allocate clone instances that are blocked in the Stopped state
+- fence_legacy: stonithd now handles killing the process group for us
+- Fencing: On timeout, clean up the agent's entire process group
+- fencing: Put all fencing agent processes into their own process group
+- crmd: Prevent crash by passing log arguments in the correct order
+- PE: Do not restart resources that depend on unmanaged resources
+- crmd: Prevent recurring monitors being cancelled due to notify operations
+- mcp: Fix so that only pacemakerd restarts, at the time of pacemakerd failure
+- mcp: Support PCMK_fail_fast to reboot a machine at the time of process (subsystem) failure
+- cpg: Ensure the CPG group is always null-terminated
+- Upstream version cs: ac7aa1c94f317fc1d4024fbc09b012bc9f1b229e
+
 -------------------------------------------------------------------
 Fri Jul 26 02:49:48 UTC 2013 - ygao@suse.com
 

pacemaker.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3843f864ba269eec29ac4e3cc78673764f1466625c6d73337f0c9fd3dd35272
-size 8739852
+oid sha256:0a4820bc52787efc1e568835cba1a3adbb94c04e71df7c8992926d6547514390
+size 8747531