|
 |
dc8c34 |
From fb5e419b287fa0a389d47813898b888715fa44a5 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
dc8c34 |
Date: Wed, 4 Mar 2015 15:05:09 -0800
|
|
|
dc8c34 |
Subject: [PATCH 399/404] Ticket #47801 - RHDS keeps on logging
|
|
|
dc8c34 |
write_changelog_and_ruv: failed to update RUV for unknown
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Description: When no operation is given to write_changelog_and_ruv
|
|
|
dc8c34 |
(consumer has the chance just to update ruv) and opcsn is NULL,
|
|
|
dc8c34 |
update_ruv_component immediately returns the default return value
|
|
|
dc8c34 |
RUV_NOTFOUND, which should not be logged as SLAPI_LOG_FATAL but
|
|
|
dc8c34 |
just ignored.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/47801
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Reviewed by rmeggins@redhat.com (Thank you, Rich!!)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
(cherry picked from commit c170d9541cca17031e2663c24a1a1e97d8b3172a)
|
|
|
dc8c34 |
(cherry picked from commit 1e38fbea783704d021950e03b57df0c54a1f7545)
|
|
|
dc8c34 |
(cherry picked from commit 423c15c6ab074ee5497c58d8429c2f59395e2bc3)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/plugins/replication/repl5_plugins.c | 10 +++++-----
|
|
|
dc8c34 |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/plugins/replication/repl5_plugins.c b/ldap/servers/plugins/replication/repl5_plugins.c
|
|
|
dc8c34 |
index 2a7abb1..9cd3845 100644
|
|
|
dc8c34 |
--- a/ldap/servers/plugins/replication/repl5_plugins.c
|
|
|
dc8c34 |
+++ b/ldap/servers/plugins/replication/repl5_plugins.c
|
|
|
dc8c34 |
@@ -1136,17 +1136,17 @@ write_changelog_and_ruv (Slapi_PBlock *pb)
|
|
|
dc8c34 |
opcsn = operation_get_csn(op);
|
|
|
dc8c34 |
rc = update_ruv_component(r, opcsn, pb);
|
|
|
dc8c34 |
if (RUV_COVERS_CSN == rc) {
|
|
|
dc8c34 |
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
|
|
|
dc8c34 |
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
|
|
|
dc8c34 |
"write_changelog_and_ruv: RUV already covers csn for "
|
|
|
dc8c34 |
"%s (uniqid: %s, optype: %lu) csn %s\n",
|
|
|
dc8c34 |
dn, uniqueid, optype,
|
|
|
dc8c34 |
csn_as_string(oppcsn, PR_FALSE, csn_str));
|
|
|
dc8c34 |
- } else if (rc != RUV_SUCCESS) {
|
|
|
dc8c34 |
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
|
|
|
dc8c34 |
+ } else if ((rc != RUV_SUCCESS) && (rc != RUV_NOTFOUND)) {
|
|
|
dc8c34 |
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
|
|
|
dc8c34 |
"write_changelog_and_ruv: failed to update RUV for "
|
|
|
dc8c34 |
- "%s (uniqid: %s, optype: %lu) to changelog csn %s\n",
|
|
|
dc8c34 |
+ "%s (uniqid: %s, optype: %lu) to changelog csn %s - rc %d\n",
|
|
|
dc8c34 |
dn, uniqueid, optype,
|
|
|
dc8c34 |
- csn_as_string(oppcsn, PR_FALSE, csn_str));
|
|
|
dc8c34 |
+ csn_as_string(oppcsn, PR_FALSE, csn_str), rc);
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
2.4.11
|
|
|
dc8c34 |
|