Reduce log rates for daemon-ocf

A 3 year old patch which made debug log default to off has been
missed. This change will add this patch so log rates for
daemon-ocf.log will decrease.
To turn on debug logging a variable shall be added for each process:
i.e. keystone
Add following like to /use/lib/ocf/resource.d/openstack/keystone
HA_debug=1

Test Plan:

PASS: Verify that by default no more debug logs are found in
daemon-ocf.log
PASS: Verify that adding HA_debug=1 to an ocf script will enable debug
logging for that process
PASS: Verify that having HA_debug=0 to an ocf script will disable
debug logging for that process

Failure Path:

PASS: Verify a value other than 0 or 1 for HA_debug will not break
process

Regression:

PASS: Verify system install
PASS: Verify all log levels, other than debug, are still being
generated

Story: 2009272
Task: 43606

Signed-off-by: Joao Paulo Tavares Musico <joaopaulotavares.musico@windriver.com>
Change-Id: Icfc62d0e7eafaaedfd0fe516f8c1b137343f8428
This commit is contained in:
Joao Paulo Tavares Musico 2021-10-12 18:58:38 -04:00 committed by jmusico
parent 7d410466af
commit ed307f794a
3 changed files with 70 additions and 0 deletions

View File

@ -0,0 +1,34 @@
From 8d4d5620ae40468e4aea4cdd42ace1c288bd4d58 Mon Sep 17 00:00:00 2001
From: jmusico <joaopaulotavares.musico@windriver.com>
Date: Fri, 8 Oct 2021 01:21:30 +0000
Subject: [PATCH 1/1] Adding missed patch to not log at debug log level when
HA_debug is unset.
Signed-off-by: jmusico <joaopaulotavares.musico@windriver.com>
---
SPECS/resource-agents.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index 941cb8b..ea888a7 100644
--- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec
@@ -141,6 +141,7 @@ Patch28: bz1641944-rabbitmq-cluster-monitor-mnesia-status.patch
Patch29: bz1641946-1-rabbitmq-cluster-fail-in-minority-partition.patch
Patch30: bz1641946-2-rabbitmq-cluster-fix-stop-regression.patch
Patch31: bz1657138-rabbitmq-cluster-ensure-node-attribures-removed.patch
+Patch32: Do-not-log-at-debug-log-level-when-HA_debug-is-unset.patch
# bundle patches
Patch1000: bz1568588-7-gcp-bundled.patch
Patch1001: bz1568588-8-google-cloud-sdk-fixes.patch
@@ -369,6 +370,7 @@ exit 1
%patch29 -p1
%patch30 -p1
%patch31 -p1
+%patch32 -p1
# add SAPHana agents to Makefile.am
mv %{saphana_prefix}-%{saphana_hash}/SAPHana/ra/SAPHana* heartbeat
--
2.29.2

View File

@ -2,3 +2,4 @@ spec-include-TiS-patches.patch
spec-avoid-dir-collisions.patch
0001-Update-package-versioning-for-TIS-format.patch
Disable-creation-of-the-debug-package.patch
Do-not-log-at-debug-log-level-when-HAdebug-is-unset.patch

View File

@ -0,0 +1,35 @@
From aae26ca70ef910e83485778c1fb450941fe79e8a Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Mon, 3 Dec 2018 16:48:14 +0100
Subject: [PATCH] Do not log at debug log level when HA_debug is unset
There might be situations (e.g. bundles) where the HA_debug variable
is unset. It makes little sense to enable debug logging when the HA_debug env
variable is unset.
So let's skip debug logs when HA_debug is set to 0 or is unset.
Tested inside a bundle and observed that previously seen 'ocf_log debug'
calls are now correctly suppressed (w/ HA_debug being unset inside the
container)
Signed-off-by: Michele Baldessari <michele@acksyn.org>
---
heartbeat/ocf-shellfuncs.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/heartbeat/ocf-shellfuncs.in b/heartbeat/ocf-shellfuncs.in
index 043ab9bf..b17297e1 100644
--- a/heartbeat/ocf-shellfuncs.in
+++ b/heartbeat/ocf-shellfuncs.in
@@ -257,7 +257,7 @@ ha_log()
ha_debug() {
- if [ "x${HA_debug}" = "x0" ] ; then
+ if [ "x${HA_debug}" = "x0" ] || [ -z "${HA_debug}" ] ; then
return 0
fi
if tty >/dev/null; then
--
2.29.2