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
23 lines
1015 B
Diff
23 lines
1015 B
Diff
From a678ce6daf71326fee7c6e2309c480f34673b0d3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
|
|
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."
|