diff --git a/SOURCES/bz1139701-pcmk-unref_reply_to_prevent_systemd_action_timeouts.patch b/SOURCES/bz1139701-pcmk-unref_reply_to_prevent_systemd_action_timeouts.patch new file mode 100644 index 0000000..bf1fc88 --- /dev/null +++ b/SOURCES/bz1139701-pcmk-unref_reply_to_prevent_systemd_action_timeouts.patch @@ -0,0 +1,18 @@ +commit c6c626c0f4f322b520d2600f8338b6b683ee365a +Author: Andrew Beekhof +Date: Tue Sep 23 09:17:34 2014 +1000 + + Fix: Bug rhbz#1139701 - Unref reply to prevent systemd action timeouts + +diff --git a/lib/services/dbus.c b/lib/services/dbus.c +index b424c0b..fce258f 100644 +--- a/lib/services/dbus.c ++++ b/lib/services/dbus.c +@@ -286,6 +286,7 @@ pcmk_dbus_get_property( + + + crm_trace("Property %s[%s] is '%s'", obj, name, output); ++ dbus_message_unref(reply); + return output; + } + diff --git a/SPECS/pacemaker.spec b/SPECS/pacemaker.spec index a1d8b4e..1183d20 100644 --- a/SPECS/pacemaker.spec +++ b/SPECS/pacemaker.spec @@ -54,7 +54,7 @@ Name: pacemaker Summary: Scalable High-Availability cluster resource manager Version: 1.1.10 -Release: %{pcmk_release}%{?dist} +Release: %{pcmk_release}%{?dist}.1 License: GPLv2+ and LGPLv2+ Url: http://www.clusterlabs.org Group: System Environment/Daemons @@ -182,6 +182,7 @@ Patch119: bz1078078-pcmk-fence_using_all_required_devices.patch Patch120: bz1078078-pcmk-execute_all_required_fencing_devices_regardless_of_what_topology_level_they_are_at.patch Patch121: bz1078078-pcmk-default_to_off_when_agent_does_not_advertise_reboot_in_metadata.patch Patch122: bz1115024-pcmk-handle_systemd_reporting_done_before_a_resource_is_actually_stopped.patch +Patch123: bz1139701-pcmk-unref_reply_to_prevent_systemd_action_timeouts.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) AutoReqProv: on @@ -650,6 +651,11 @@ exit 0 %doc AUTHORS %changelog +* Mon Sep 22 2014 Andrew Beekhof - 1.1.10-32.el7_0.1 + +- Fix: Bug rhbz#1139701 - Unref dbus reply to prevent systemd action timeouts + Resolves: rhbz#1145740 + * Fri Jul 04 2014 Andrew Beekhof - 1.1.10-32 - Fix: lrmd: Handle systemd reporting 'done' before a resource is actually stopped