From 55989018a8180c74715aa46cdfd6b92ee506501d Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Wed, 4 Mar 2015 15:05:09 -0800 Subject: [PATCH] Ticket #47801 - RHDS keeps on logging write_changelog_and_ruv: failed to update RUV for unknown Description: When no operation is given to write_changelog_and_ruv (consumer has the chance just to update ruv) and opcsn is NULL, update_ruv_component immediately returns the default return value RUV_NOTFOUND, which should not be logged as SLAPI_LOG_FATAL but just ignored. --- ldap/servers/plugins/replication/repl5_plugins.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ldap/servers/plugins/replication/repl5_plugins.c b/ldap/servers/plugins/replication/repl5_plugins.c index 495afeb..84e4a07 100644 --- a/ldap/servers/plugins/replication/repl5_plugins.c +++ b/ldap/servers/plugins/replication/repl5_plugins.c @@ -1233,17 +1233,17 @@ write_changelog_and_ruv (Slapi_PBlock *pb) } rc = update_ruv_component(r, opcsn, pb); if (RUV_COVERS_CSN == rc) { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "write_changelog_and_ruv: RUV already covers csn for " "%s (uniqid: %s, optype: %lu) csn %s\n", dn, uniqueid, optype, csn_as_string(oppcsn, PR_FALSE, csn_str)); - } else if (rc != RUV_SUCCESS) { - slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, + } else if ((rc != RUV_SUCCESS) && (rc != RUV_NOTFOUND)) { + slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "write_changelog_and_ruv: failed to update RUV for " - "%s (uniqid: %s, optype: %lu) to changelog csn %s\n", + "%s (uniqid: %s, optype: %lu) to changelog csn %s - rc %d\n", dn, uniqueid, optype, - csn_as_string(oppcsn, PR_FALSE, csn_str)); + csn_as_string(oppcsn, PR_FALSE, csn_str), rc); } } -- 1.9.3