From b89acbf7ca8ad8bcb149ef9215fd36624478ee982d821afe15f5335f3809790e Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Tue, 28 Mar 2017 20:04:35 +0000 Subject: [PATCH] Accepting request 483185 from home:yan_gao:branches:network:ha-clustering:Factory:Test - libcrmcluster,crmd: log join phase as text rather than integer - pacemaker-remote: pacemaker_remoted shutdown while unmanaged - tools: disable agent stdout/stderr for crm_resource --validate - tools: Add "--validate" command to crm_resource - tools: crm_resource should set OCF_RESKEY_crm_feature_set - tools: make crm_failcount compatible with per-operation failcounts - tools: support clearing failure of a single operation with crm_resource -C - crmd: support clearing failure of a single operation - crmd: make clearing last failure more efficient - attrd,libcrmcommon: support clearing failure of a single operation - attrd,crmd,libraries,tools: track resource failures per-operation - tools: support crm_failcount -q as advertised - Upstream version cs: 77ea74d01bcb6b7100e1c7acab0e66e79aceaf8b - NodeUtilization: Never set hv_memory to a negative value (bsc#1015842) * bug-1015842_pacemaker-NodeUtilization-RA-3.patch - NodeUtilization: Fix mixed indentation, set executable bit (bsc#1015842) * bug-1015842_pacemaker-NodeUtilization-RA-2.patch - RA: NodeUtilization - Use xl if available (bsc#1015842) * Rename to bug-1015842_pacemaker-NodeUtilization-RA-1.patch OBS-URL: https://build.opensuse.org/request/show/483185 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=265 --- _service | 2 +- ...15842_pacemaker-NodeUtilization-RA-1.patch | 4 +- ...15842_pacemaker-NodeUtilization-RA-2.patch | 66 +++++++++++++++++++ ...15842_pacemaker-NodeUtilization-RA-3.patch | 22 +++++++ pacemaker-1.1.16+20170316.e55d506.tar.bz2 | 3 - pacemaker-1.1.16+20170320.77ea74d.tar.bz2 | 3 + pacemaker.changes | 29 ++++++++ pacemaker.spec | 26 ++++---- 8 files changed, 138 insertions(+), 17 deletions(-) rename bug-1015842_pacemaker-NodeUtilization-RA.patch => bug-1015842_pacemaker-NodeUtilization-RA-1.patch (99%) create mode 100644 bug-1015842_pacemaker-NodeUtilization-RA-2.patch create mode 100644 bug-1015842_pacemaker-NodeUtilization-RA-3.patch delete mode 100644 pacemaker-1.1.16+20170316.e55d506.tar.bz2 create mode 100644 pacemaker-1.1.16+20170320.77ea74d.tar.bz2 diff --git a/_service b/_service index 696d7a1..5ce0891 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.16 --> 1.1.16+git%cd.%h - e55d506cc390f0a0335b4ec6e365ea89da30b6b1 + 77ea74d01bcb6b7100e1c7acab0e66e79aceaf8b diff --git a/bug-1015842_pacemaker-NodeUtilization-RA.patch b/bug-1015842_pacemaker-NodeUtilization-RA-1.patch similarity index 99% rename from bug-1015842_pacemaker-NodeUtilization-RA.patch rename to bug-1015842_pacemaker-NodeUtilization-RA-1.patch index 94bc464..0303a59 100644 --- a/bug-1015842_pacemaker-NodeUtilization-RA.patch +++ b/bug-1015842_pacemaker-NodeUtilization-RA-1.patch @@ -1,4 +1,4 @@ -From ab4df57e195486ee651f56793470d421233a0896 Mon Sep 17 00:00:00 2001 +From b8d5e3eec6ade13af37cf4a8f5a08c3488585f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= Date: Thu, 2 Feb 2017 09:06:00 +0100 Subject: [PATCH] Medium: NodeUtilization: Add NodeUtilization agent @@ -24,7 +24,7 @@ diff --git a/extra/resources/Makefile.am b/extra/resources/Makefile.am diff --git a/extra/resources/NodeUtilization b/extra/resources/NodeUtilization new file mode 100644 -index 0000000..da5fb56 +index 0000000..b9c737e --- /dev/null +++ b/extra/resources/NodeUtilization @@ -0,0 +1,224 @@ diff --git a/bug-1015842_pacemaker-NodeUtilization-RA-2.patch b/bug-1015842_pacemaker-NodeUtilization-RA-2.patch new file mode 100644 index 0000000..c5155ea --- /dev/null +++ b/bug-1015842_pacemaker-NodeUtilization-RA-2.patch @@ -0,0 +1,66 @@ +From 25264762338c210e865b3531baa33705c40e7ea9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Wed, 15 Mar 2017 13:30:19 +0100 +Subject: [PATCH] NodeUtilization: Fix mixed indentation, set executable bit + +--- + extra/resources/NodeUtilization | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + mode change 100644 => 100755 extra/resources/NodeUtilization + +diff --git a/extra/resources/NodeUtilization b/extra/resources/NodeUtilization +old mode 100644 +new mode 100755 +index b9c737e..f246010 +--- a/extra/resources/NodeUtilization ++++ b/extra/resources/NodeUtilization +@@ -173,7 +173,7 @@ END + } + + NodeUtilization_start() { +- ha_pseudo_resource $statefile start ++ ha_pseudo_resource $statefile start + if ! ocf_is_true "$OCF_RESKEY_dynamic"; then + if ! set_utilization; then + exit $OCF_ERR_GENERIC +@@ -183,25 +183,25 @@ NodeUtilization_start() { + } + + NodeUtilization_stop() { +- ha_pseudo_resource $statefile stop ++ ha_pseudo_resource $statefile stop + exit $OCF_SUCCESS + } + + NodeUtilization_monitor() { +- local rc +- ha_pseudo_resource $statefile monitor +- rc=$? +- +- case $rc in +- $OCF_SUCCESS) +- if ocf_is_true "$OCF_RESKEY_dynamic"; then +- if ! set_utilization; then +- exit $OCF_ERR_GENERIC +- fi +- fi +- ;; +- *) exit $rc;; +- esac ++ local rc ++ ha_pseudo_resource $statefile monitor ++ rc=$? ++ ++ case $rc in ++ $OCF_SUCCESS) ++ if ocf_is_true "$OCF_RESKEY_dynamic"; then ++ if ! set_utilization; then ++ exit $OCF_ERR_GENERIC ++ fi ++ fi ++ ;; ++ *) exit $rc;; ++ esac + } + + NodeUtilization_validate() { diff --git a/bug-1015842_pacemaker-NodeUtilization-RA-3.patch b/bug-1015842_pacemaker-NodeUtilization-RA-3.patch new file mode 100644 index 0000000..d150325 --- /dev/null +++ b/bug-1015842_pacemaker-NodeUtilization-RA-3.patch @@ -0,0 +1,22 @@ +From a678ce6daf71326fee7c6e2309c480f34673b0d3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Wed, 15 Mar 2017 13:36:15 +0100 +Subject: [PATCH] NodeUtilization: Never set hv_memory to a negative value + +--- + extra/resources//NodeUtilization | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/heartbeat/NodeUtilization b/heartbeat/NodeUtilization +index f246010..61969e6 100755 +--- a/extra/resources//NodeUtilization ++++ b/extra/resources//NodeUtilization +@@ -155,6 +155,8 @@ set_utilization() { + hv_mem=$(( $(Host_Total_Memory) - OCF_RESKEY_utilization_hv_memory_reservation )) + uti_mem=$(crm_attribute -Q -t nodes -U "$host_name" -z -n hv_memory 2>/dev/null) + ++ [ $hv_mem -lt 0 ] && hv_mem=0 ++ + if [ "$hv_mem" != "$uti_mem" ]; then + if ! crm_attribute -t nodes -U "$host_name" -z -n hv_memory -v $hv_mem; then + ocf_log err "Failed to set the hv_memory utilization attribute for $host_name using crm_attribute." diff --git a/pacemaker-1.1.16+20170316.e55d506.tar.bz2 b/pacemaker-1.1.16+20170316.e55d506.tar.bz2 deleted file mode 100644 index eef1984..0000000 --- a/pacemaker-1.1.16+20170316.e55d506.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4df686152c55ef41368f960bf94f5af09cc02eb681fdad85678edf0423b666ca -size 3966055 diff --git a/pacemaker-1.1.16+20170320.77ea74d.tar.bz2 b/pacemaker-1.1.16+20170320.77ea74d.tar.bz2 new file mode 100644 index 0000000..d768207 --- /dev/null +++ b/pacemaker-1.1.16+20170320.77ea74d.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e259506a9b70639a9e06bd6b508f0fcc5bbc7daa487effd736220983c485d81e +size 3963273 diff --git a/pacemaker.changes b/pacemaker.changes index 1f8566f..3c5e43f 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Mar 23 16:02:22 UTC 2017 - ygao@suse.com + +- libcrmcluster,crmd: log join phase as text rather than integer +- pacemaker-remote: pacemaker_remoted shutdown while unmanaged +- tools: disable agent stdout/stderr for crm_resource --validate +- tools: Add "--validate" command to crm_resource +- tools: crm_resource should set OCF_RESKEY_crm_feature_set +- tools: make crm_failcount compatible with per-operation failcounts +- tools: support clearing failure of a single operation with crm_resource -C +- crmd: support clearing failure of a single operation +- crmd: make clearing last failure more efficient +- attrd,libcrmcommon: support clearing failure of a single operation +- attrd,crmd,libraries,tools: track resource failures per-operation +- tools: support crm_failcount -q as advertised +- Upstream version cs: 77ea74d01bcb6b7100e1c7acab0e66e79aceaf8b + +------------------------------------------------------------------- +Fri Mar 17 16:10:49 UTC 2017 - ygao@suse.com + +- NodeUtilization: Never set hv_memory to a negative value (bsc#1015842) + * bug-1015842_pacemaker-NodeUtilization-RA-3.patch + +- NodeUtilization: Fix mixed indentation, set executable bit (bsc#1015842) + * bug-1015842_pacemaker-NodeUtilization-RA-2.patch + +- RA: NodeUtilization - Use xl if available (bsc#1015842) + * Rename to bug-1015842_pacemaker-NodeUtilization-RA-1.patch + ------------------------------------------------------------------- Fri Mar 17 11:07:49 UTC 2017 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index ae5de6a..f171b39 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -25,7 +25,7 @@ ## Where to install Pacemaker documentation %global pcmk_docdir %{_docdir}/%{name} -%global commit 1.1.16+20170316.e55d506 +%global commit 1.1.16+20170320.77ea74d ## Corosync version %define cs_version 2 @@ -80,16 +80,18 @@ Source1: crm_report.in Source100: pacemaker.rpmlintrc Patch1: bug-806256_pacemaker-log-level-notice.patch Patch2: bug-728579_pacemaker-stonith-dev-id.patch -Patch3: bug-1015842_pacemaker-NodeUtilization-RA.patch -Patch4: pacemaker-cibsecret-tool-temp-disabled.patch -Patch5: pacemaker-nagios-plugin-dir.patch -Patch6: bug-812269_pacemaker-fencing-device-register-messages.patch -Patch7: pacemaker-Wno-format-signedness.patch -Patch8: bug-943295_pacemaker-lrmd-log-notice.patch -Patch9: bug-977201_pacemaker-controld-self-fencing.patch -Patch10: bug-995365_pacemaker-cts-restart-systemd-journald.patch -Patch11: pacemaker-lrmd.h-include-libxml.patch -Patch12: bug-1028138_pacemaker-pacemaker.service-TasksMax.patch +Patch3: pacemaker-cibsecret-tool-temp-disabled.patch +Patch4: pacemaker-nagios-plugin-dir.patch +Patch5: bug-812269_pacemaker-fencing-device-register-messages.patch +Patch6: pacemaker-Wno-format-signedness.patch +Patch7: bug-943295_pacemaker-lrmd-log-notice.patch +Patch8: bug-977201_pacemaker-controld-self-fencing.patch +Patch9: bug-995365_pacemaker-cts-restart-systemd-journald.patch +Patch10: bug-1028138_pacemaker-pacemaker.service-TasksMax.patch +Patch11: bug-1015842_pacemaker-NodeUtilization-RA-1.patch +Patch12: bug-1015842_pacemaker-NodeUtilization-RA-2.patch +Patch13: bug-1015842_pacemaker-NodeUtilization-RA-3.patch +Patch14: pacemaker-lrmd.h-include-libxml.patch # Required for core functionality BuildRequires: autoconf BuildRequires: automake @@ -308,6 +310,8 @@ manager for Corosync, CMAN and/or Linux-HA. %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 +%patch14 -p1 %build