From 6e186d3f7365652326fc23fceda768497e3ecd1a Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Mon, 19 Aug 2013 11:04:03 +0200 Subject: [PATCH 1/4] Fix scheduler pause-detection timeout patch Signed-off-by: Jan Friesse --- ...ix-scheduler-pause-detection-timeout.patch | 30 +++++++++++++++++++ corosync.spec | 11 ++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 bz998362-1-Fix-scheduler-pause-detection-timeout.patch diff --git a/bz998362-1-Fix-scheduler-pause-detection-timeout.patch b/bz998362-1-Fix-scheduler-pause-detection-timeout.patch new file mode 100644 index 0000000..d766a17 --- /dev/null +++ b/bz998362-1-Fix-scheduler-pause-detection-timeout.patch @@ -0,0 +1,30 @@ +From 2740cfd1eac60714601c74df2137fe588b607866 Mon Sep 17 00:00:00 2001 +From: Michael Chapman +Date: Mon, 19 Aug 2013 01:30:15 +0000 +Subject: [PATCH] Fix scheduler pause-detection timeout + +qb_loop_timer_add expects the timeout to be in nanoseconds, but we were +passing the value in milliseconds. Scale the timeout appropriately. + +Signed-off-by: Michael Chapman +Reviewed-by: Jan Friesse +--- + exec/main.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/exec/main.c b/exec/main.c +index 65b28c2..6c69ee5 100644 +--- a/exec/main.c ++++ b/exec/main.c +@@ -824,7 +824,7 @@ static void timer_function_scheduler_timeout (void *data) + timeout_data->max_tv_diff = timeout_data->totem_config->token_timeout * QB_TIME_NS_IN_MSEC * 0.8; + qb_loop_timer_add (corosync_poll_handle, + QB_LOOP_MED, +- timeout_data->totem_config->token_timeout / 3, ++ timeout_data->totem_config->token_timeout * QB_TIME_NS_IN_MSEC / 3, + timeout_data, + timer_function_scheduler_timeout, + &timeout_data->handle); +-- +1.7.1 + diff --git a/corosync.spec b/corosync.spec index 834f405..d35b5d1 100644 --- a/corosync.spec +++ b/corosync.spec @@ -21,12 +21,14 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.3.1 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://www.corosync.org/ Source0: http://corosync.org/download/%{name}-%{version}%{?gittarver}.tar.gz +Patch0: bz998362-1-Fix-scheduler-pause-detection-timeout.patch + %if 0%{?rhel} ExclusiveArch: i686 x86_64 %endif @@ -73,6 +75,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %prep %setup -q -n %{name}-%{version}%{?gittarver} +%patch0 -p1 -b .bz998362-1 %build %if %{with runautogen} @@ -331,6 +334,12 @@ The Corosync Cluster Engine APIs. %{_mandir}/man8/quorum_overview.8* %changelog +* Mon Aug 19 2013 Jan Friesse 2.3.1-2 +- Resolves: rhbz#998362 + +- Fix scheduler pause-detection timeout (rhbz#998362) +- merge upstream commit 2740cfd1eac60714601c74df2137fe588b607866 (rhbz#998362) + * Wed Jul 10 2013 Jan Friesse - 2.3.1-1 - New upstream release - Fix incorrect dates in specfile changelog section From c781ac3da9572046040607ae472dec4d857194b7 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Mon, 16 Sep 2013 11:18:36 +0200 Subject: [PATCH 2/4] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + ...ix-scheduler-pause-detection-timeout.patch | 30 ------------------- corosync.spec | 10 +++---- sources | 2 +- 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 bz998362-1-Fix-scheduler-pause-detection-timeout.patch diff --git a/.gitignore b/.gitignore index 73fdaf6..19dcad9 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ corosync-1.2.7.tar.gz /corosync-2.2.0.tar.gz /corosync-2.3.0.tar.gz /corosync-2.3.1.tar.gz +/corosync-2.3.2.tar.gz diff --git a/bz998362-1-Fix-scheduler-pause-detection-timeout.patch b/bz998362-1-Fix-scheduler-pause-detection-timeout.patch deleted file mode 100644 index d766a17..0000000 --- a/bz998362-1-Fix-scheduler-pause-detection-timeout.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2740cfd1eac60714601c74df2137fe588b607866 Mon Sep 17 00:00:00 2001 -From: Michael Chapman -Date: Mon, 19 Aug 2013 01:30:15 +0000 -Subject: [PATCH] Fix scheduler pause-detection timeout - -qb_loop_timer_add expects the timeout to be in nanoseconds, but we were -passing the value in milliseconds. Scale the timeout appropriately. - -Signed-off-by: Michael Chapman -Reviewed-by: Jan Friesse ---- - exec/main.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/exec/main.c b/exec/main.c -index 65b28c2..6c69ee5 100644 ---- a/exec/main.c -+++ b/exec/main.c -@@ -824,7 +824,7 @@ static void timer_function_scheduler_timeout (void *data) - timeout_data->max_tv_diff = timeout_data->totem_config->token_timeout * QB_TIME_NS_IN_MSEC * 0.8; - qb_loop_timer_add (corosync_poll_handle, - QB_LOOP_MED, -- timeout_data->totem_config->token_timeout / 3, -+ timeout_data->totem_config->token_timeout * QB_TIME_NS_IN_MSEC / 3, - timeout_data, - timer_function_scheduler_timeout, - &timeout_data->handle); --- -1.7.1 - diff --git a/corosync.spec b/corosync.spec index d35b5d1..0f6c95b 100644 --- a/corosync.spec +++ b/corosync.spec @@ -20,15 +20,13 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.3.1 -Release: 2%{?gitver}%{?dist} +Version: 2.3.2 +Release: 1%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://www.corosync.org/ Source0: http://corosync.org/download/%{name}-%{version}%{?gittarver}.tar.gz -Patch0: bz998362-1-Fix-scheduler-pause-detection-timeout.patch - %if 0%{?rhel} ExclusiveArch: i686 x86_64 %endif @@ -75,7 +73,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %prep %setup -q -n %{name}-%{version}%{?gittarver} -%patch0 -p1 -b .bz998362-1 %build %if %{with runautogen} @@ -334,6 +331,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man8/quorum_overview.8* %changelog +* Mon Sep 16 2013 Jan Friesse - 2.3.2-1 +- New upstream release + * Mon Aug 19 2013 Jan Friesse 2.3.1-2 - Resolves: rhbz#998362 diff --git a/sources b/sources index 8aba322..29d89dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3a76155e05c0a6ec34b2d0ad281fb02 corosync-2.3.1.tar.gz +0471219664186d110273b8ce48b1d169 corosync-2.3.2.tar.gz From 428e05d103f4e942ce373b2c63f5df93554a9f1d Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 14 Jan 2014 17:00:58 +0100 Subject: [PATCH 3/4] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 19dcad9..464489a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ corosync-1.2.7.tar.gz /corosync-2.3.0.tar.gz /corosync-2.3.1.tar.gz /corosync-2.3.2.tar.gz +/corosync-2.3.3.tar.gz diff --git a/corosync.spec b/corosync.spec index 0f6c95b..a79bea3 100644 --- a/corosync.spec +++ b/corosync.spec @@ -20,7 +20,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.3.2 +Version: 2.3.3 Release: 1%{?gitver}%{?dist} License: BSD Group: System Environment/Base @@ -331,6 +331,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man8/quorum_overview.8* %changelog +* Tue Jan 14 2014 Jan Friesse - 2.3.3-1 +- New upstream release + * Mon Sep 16 2013 Jan Friesse - 2.3.2-1 - New upstream release diff --git a/sources b/sources index 29d89dd..1a0e5e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0471219664186d110273b8ce48b1d169 corosync-2.3.2.tar.gz +e68e97bff74fc56c86493dc7def5f1bc corosync-2.3.3.tar.gz From 12682a47064533486c072737b09be83d5060b8e0 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 26 Aug 2014 16:44:36 +0200 Subject: [PATCH 4/4] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 464489a..b66bacd 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ corosync-1.2.7.tar.gz /corosync-2.3.1.tar.gz /corosync-2.3.2.tar.gz /corosync-2.3.3.tar.gz +/corosync-2.3.4.tar.gz diff --git a/corosync.spec b/corosync.spec index a79bea3..44dc234 100644 --- a/corosync.spec +++ b/corosync.spec @@ -20,7 +20,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.3.3 +Version: 2.3.4 Release: 1%{?gitver}%{?dist} License: BSD Group: System Environment/Base @@ -139,6 +139,9 @@ rm -rf %{buildroot}%{_docdir}/* mkdir -p %{buildroot}%{_sysconfdir}/sysconfig install -m 644 tools/corosync-notifyd.sysconfig.example \ %{buildroot}%{_sysconfdir}/sysconfig/corosync-notifyd +# /etc/sysconfig/corosync +install -m 644 init/corosync.sysconfig.example \ + %{buildroot}%{_sysconfdir}/sysconfig/corosync %clean rm -rf %{buildroot} @@ -195,6 +198,7 @@ fi %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu %config(noreplace) %{_sysconfdir}/sysconfig/corosync-notifyd +%config(noreplace) %{_sysconfdir}/sysconfig/corosync %if %{with dbus} %{_sysconfdir}/dbus-1/system.d/corosync-signals.conf %endif @@ -331,6 +335,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man8/quorum_overview.8* %changelog +* Tue Aug 26 2014 Jan Friesse - 2.3.4-1 +- New upstream release + * Tue Jan 14 2014 Jan Friesse - 2.3.3-1 - New upstream release diff --git a/sources b/sources index 1a0e5e5..aea9f05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e68e97bff74fc56c86493dc7def5f1bc corosync-2.3.3.tar.gz +4b0f36a1dc014527e5b192265dbd7e70 corosync-2.3.4.tar.gz