b89acbf7ca
- 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
67 lines
1.7 KiB
Diff
67 lines
1.7 KiB
Diff
From 25264762338c210e865b3531baa33705c40e7ea9 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
|
|
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() {
|