ctdb-daemon: Fix CID 1125575 Operands don't affect result
authorMartin Schwenke <martin@meltin.net>
Wed, 10 Aug 2016 06:46:51 +0000 (16:46 +1000)
committerMartin Schwenke <martins@samba.org>
Wed, 17 Aug 2016 21:00:24 +0000 (23:00 +0200)
This is related to an error, so repeatedly log at error level instead
of trying to avoid repetition.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12157

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/server/ctdb_monitor.c

index 87a38c708ee95b4521e56b4c274a572ef4a073a4..00f652407e871679526cf3c21a91f218771675d6 100644 (file)
@@ -354,7 +354,7 @@ static void ctdb_wait_until_recovered(struct tevent_context *ev,
        if (ret != 0) {
                ctdb->db_persistent_check_errors++;
                if (ctdb->db_persistent_check_errors < ctdb->max_persistent_check_errors) {
-                       DEBUG(ctdb->db_persistent_check_errors==1?DEBUG_ERR:DEBUG_WARNING,
+                       DEBUG(DEBUG_ERR,
                              (__location__ "ctdb_recheck_persistent_health() "
                              "failed (%llu of %llu times) - retry later\n",
                              (unsigned long long)ctdb->db_persistent_check_errors,