From bb335e01c480b762fb752d8fbc021d99a4fa91f3 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Dec 05 2018 17:42:38 +0000 Subject: Ticket 49864 - Revised replication status messages for transient errors Description: Transient errors are temporary conditions that usually resolve themselves. But the message are vague and alarming. This patch changes it to a "warning" message. https://pagure.io/389-ds-base/issue/49864 Reviewed by: spichugi & firstyear(Thanks!) --- diff --git a/ldap/servers/plugins/replication/repl5_inc_protocol.c b/ldap/servers/plugins/replication/repl5_inc_protocol.c index 2aefb79..9140c34 100644 --- a/ldap/servers/plugins/replication/repl5_inc_protocol.c +++ b/ldap/servers/plugins/replication/repl5_inc_protocol.c @@ -1065,7 +1065,7 @@ repl5_inc_run(Private_Repl_Protocol *prp) } else if (rc == UPDATE_TRANSIENT_ERROR) { dev_debug("repl5_inc_run(STATE_SENDING_UPDATES) -> send_updates = UPDATE_TRANSIENT_ERROR -> STATE_BACKOFF_START"); agmt_set_last_update_status(prp->agmt, 0, NSDS50_REPL_TRANSIENT_ERROR, - "Incremental update transient error. Backing off, will retry update later."); + "Incremental update transient warning. Backing off, will retry update later."); next_state = STATE_BACKOFF_START; } else if (rc == UPDATE_FATAL_ERROR) { dev_debug("repl5_inc_run(STATE_SENDING_UPDATES) -> send_updates = UPDATE_FATAL_ERROR -> STATE_STOP_FATAL_ERROR"); diff --git a/ldap/servers/plugins/replication/repl5_protocol_util.c b/ldap/servers/plugins/replication/repl5_protocol_util.c index 78159ad..a48d4d0 100644 --- a/ldap/servers/plugins/replication/repl5_protocol_util.c +++ b/ldap/servers/plugins/replication/repl5_protocol_util.c @@ -662,7 +662,7 @@ protocol_response2string(int response) case NSDS50_REPL_CONN_TIMEOUT: return "connection timeout"; case NSDS50_REPL_TRANSIENT_ERROR: - return "transient error"; + return "transient warning"; case NSDS50_REPL_RUV_ERROR: return "RUV error"; default: