summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohit Agrawal <moagrawa@redhat.com>2018-01-25 10:03:09 +0530
committerRaghavendra G <rgowdapp@redhat.com>2018-01-30 09:34:51 +0000
commitc142d26e44436d805e476f2d13ac8726052a59c4 (patch)
treeee2e7abfa1056bbe6d9256bd8663183007b62ad0
parent016165c4110b2bd5bba5c64b7a3d09e9bc4928c2 (diff)
rpc: Showing some unusual timer error logs during brick stop
Solution: Update msg condition in gf_timer_call_after function to avoid the message BUG: 1538427 Change-Id: I849e8e052a8259cf977fd5e7ff3aeba52f9b5f27 Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
-rw-r--r--libglusterfs/src/timer.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/libglusterfs/src/timer.c b/libglusterfs/src/timer.c
index 321000e90c5..68ac7b0edff 100644
--- a/libglusterfs/src/timer.c
+++ b/libglusterfs/src/timer.c
@@ -30,10 +30,11 @@ gf_timer_call_after (glusterfs_ctx_t *ctx,
gf_timer_t *trav = NULL;
uint64_t at = 0;
- if (ctx == NULL)
+ if ((ctx == NULL) || (ctx->cleanup_started))
{
gf_msg_callingfn ("timer", GF_LOG_ERROR, EINVAL,
- LG_MSG_INVALID_ARG, "invalid argument");
+ LG_MSG_INVALID_ARG, "Either ctx is NULL or"
+ " ctx cleanup started");
return NULL;
}
@@ -224,19 +225,6 @@ gf_timer_registry_init (glusterfs_ctx_t *ctx)
gf_timer_registry_t *reg = NULL;
int ret = -1;
- if (ctx == NULL) {
- gf_msg_callingfn ("timer", GF_LOG_ERROR, EINVAL,
- LG_MSG_INVALID_ARG, "invalid argument");
- return NULL;
- }
-
- if (ctx->cleanup_started) {
- gf_msg_callingfn ("timer", GF_LOG_INFO, 0,
- LG_MSG_CTX_CLEANUP_STARTED,
- "ctx cleanup started");
- return NULL;
- }
-
LOCK (&ctx->lock);
{
reg = ctx->timer;