|
 |
50dc83 |
From 82d7c8e057b9e22d13ca89f2a75e65a42878b7c3 Mon Sep 17 00:00:00 2001
|
|
|
50dc83 |
From: Atin Mukherjee <amukherj@redhat.com>
|
|
|
50dc83 |
Date: Tue, 2 Apr 2019 10:45:15 +0530
|
|
|
50dc83 |
Subject: [PATCH 092/124] logging: Fix GF_LOG_OCCASSIONALLY API
|
|
|
50dc83 |
|
|
|
50dc83 |
GF_LOG_OCCASSIONALLY doesn't log on the first instance rather at every
|
|
|
50dc83 |
42nd iterations which isn't effective as in some cases we might not have
|
|
|
50dc83 |
the code flow hitting the same log for as many as 42 times and we'd end
|
|
|
50dc83 |
up suppressing the log.
|
|
|
50dc83 |
|
|
|
50dc83 |
>upstream fix : https://review.gluster.org/#/c/glusterfs/+/22475/
|
|
|
50dc83 |
>Fixes: bz#1694925
|
|
|
50dc83 |
>Change-Id: Iee293281d25a652b64df111d59b13de4efce06fa
|
|
|
50dc83 |
>Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
50dc83 |
|
|
|
50dc83 |
BUG: 1691620
|
|
|
50dc83 |
Change-Id: Iee293281d25a652b64df111d59b13de4efce06fa
|
|
|
50dc83 |
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
50dc83 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/167822
|
|
|
50dc83 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
50dc83 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
50dc83 |
---
|
|
|
50dc83 |
libglusterfs/src/glusterfs/logging.h | 2 +-
|
|
|
50dc83 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
50dc83 |
|
|
|
50dc83 |
diff --git a/libglusterfs/src/glusterfs/logging.h b/libglusterfs/src/glusterfs/logging.h
|
|
|
50dc83 |
index c81e19b..3655b1d 100644
|
|
|
50dc83 |
--- a/libglusterfs/src/glusterfs/logging.h
|
|
|
50dc83 |
+++ b/libglusterfs/src/glusterfs/logging.h
|
|
|
50dc83 |
@@ -300,7 +300,7 @@ _gf_log_eh(const char *function, const char *fmt, ...)
|
|
|
50dc83 |
|
|
|
50dc83 |
/* Log once in GF_UNIVERSAL_ANSWER times */
|
|
|
50dc83 |
#define GF_LOG_OCCASIONALLY(var, args...) \
|
|
|
50dc83 |
- if (!(var++ % GF_UNIVERSAL_ANSWER)) { \
|
|
|
50dc83 |
+ if (var++ == 0 || !((var - 1) % GF_UNIVERSAL_ANSWER)) { \
|
|
|
50dc83 |
gf_log(args); \
|
|
|
50dc83 |
}
|
|
|
50dc83 |
|
|
|
50dc83 |
--
|
|
|
50dc83 |
1.8.3.1
|
|
|
50dc83 |
|