From af2e9dd4ff9cf194bac8476fc631a284f125e03a Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Fri, 4 Dec 2015 13:18:57 +0100 Subject: [PATCH] add/use dfsm_is_initialized to avoid unnecessary error logs at startup --- data/src/dfsm.c | 8 ++++++++ data/src/dfsm.h | 3 +++ data/src/status.c | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/data/src/dfsm.c b/data/src/dfsm.c index bf2d78c..fd35174 100644 --- a/data/src/dfsm.c +++ b/data/src/dfsm.c @@ -1273,6 +1273,14 @@ err: return NULL; } +gboolean +dfsm_is_initialized(dfsm_t *dfsm) +{ + g_return_val_if_fail(dfsm != NULL, FALSE); + + return (dfsm->cpg_handle != 0) ? TRUE : FALSE; +} + gboolean dfsm_lowest_nodeid(dfsm_t *dfsm) { diff --git a/data/src/dfsm.h b/data/src/dfsm.h index 2f2d19d..6a4081d 100644 --- a/data/src/dfsm.h +++ b/data/src/dfsm.h @@ -148,6 +148,9 @@ dfsm_dispatch( gboolean dfsm_restartable(dfsm_t *dfsm); +gboolean +dfsm_is_initialized(dfsm_t *dfsm); + void dfsm_set_errormode(dfsm_t *dfsm); diff --git a/data/src/status.c b/data/src/status.c index cb6b6d1..bcd9145 100644 --- a/data/src/status.c +++ b/data/src/status.c @@ -368,7 +368,8 @@ cfs_cluster_log(clog_entry_t *entry) iov[0].iov_base = (char *)entry; iov[0].iov_len = clog_entry_size(entry); - dfsm_send_message(cfs_status.kvstore, KVSTORE_MESSAGE_LOG, iov, 1); + if (dfsm_is_initialized(cfs_status.kvstore)) + dfsm_send_message(cfs_status.kvstore, KVSTORE_MESSAGE_LOG, iov, 1); } } @@ -1175,6 +1176,8 @@ kvstore_send_update_message( gpointer data, guint32 len) { + if (!dfsm_is_initialized(dfsm)) + return -EACCES; struct iovec iov[2]; -- 2.39.2