|
 |
723150 |
From 0085cfb4c4ff6722898e97704a67dcdfcba53388 Mon Sep 17 00:00:00 2001
|
|
|
723150 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
723150 |
Date: Wed, 25 Jan 2017 13:39:08 -0800
|
|
|
723150 |
Subject: [PATCH 65/67] Ticket 49008 backport 1.3.5 : aborted operation can
|
|
|
723150 |
leave RUV in incorrect state
|
|
|
723150 |
|
|
|
723150 |
Description: Fixed 2 backport errors in commit 79a3deafe943a3ce5c31c50272939146d17bd7ac.
|
|
|
723150 |
(cherry picked from commit 3fa6596bdc677cdb3fb65b7baf6fd567485c91a7)
|
|
|
723150 |
---
|
|
|
723150 |
ldap/servers/plugins/replication/csnpl.c | 4 ++--
|
|
|
723150 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
723150 |
|
|
|
723150 |
diff --git a/ldap/servers/plugins/replication/csnpl.c b/ldap/servers/plugins/replication/csnpl.c
|
|
|
723150 |
index db1ae13..a696fc1 100644
|
|
|
723150 |
--- a/ldap/servers/plugins/replication/csnpl.c
|
|
|
723150 |
+++ b/ldap/servers/plugins/replication/csnpl.c
|
|
|
723150 |
@@ -220,14 +220,14 @@ int csnplCommitAll (CSNPL *csnpl, const CSN *csn)
|
|
|
723150 |
char csn_str[CSN_STRSIZE];
|
|
|
723150 |
|
|
|
723150 |
csn_as_string(csn, PR_FALSE, csn_str);
|
|
|
723150 |
- slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
|
|
|
723150 |
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
|
|
|
723150 |
"csnplCommitALL: committing all csns for csn %s\n", csn_str);
|
|
|
723150 |
slapi_rwlock_wrlock (csnpl->csnLock);
|
|
|
723150 |
data = (csnpldata *)llistGetFirst(csnpl->csnList, &iterator);
|
|
|
723150 |
while (NULL != data)
|
|
|
723150 |
{
|
|
|
723150 |
csn_as_string(data->csn, PR_FALSE, csn_str);
|
|
|
723150 |
- slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
|
|
|
723150 |
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
|
|
|
723150 |
"csnplCommitALL: processing data csn %s\n", csn_str);
|
|
|
723150 |
if (csn_is_equal(data->csn, csn) ||
|
|
|
723150 |
csn_is_equal(data->prim_csn, csn)) {
|
|
|
723150 |
--
|
|
|
723150 |
2.9.3
|
|
|
723150 |
|