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