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