[389-commits] Branch '389-ds-base-1.2.11' - ldap/servers

ldap/servers/slapd/back-ldbm/import-threads.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit d45d040db7284d404fd5d594b83468e036fb003e
Author: Noriko Hosoi <nhosoi@redhat.com>
Date: Thu May 26 17:58:51 2016 -0700

Ticket #48854 - Running db2index with no options breaks replication

Bug Description: It was a bug in import_foreman which was not adjusted
when the backend RUV entry was redesigned. The backend RUV entry has
no parent entry by nature. But import-forman mistakenly skipped to
handle the entry. If the 'db2index' command line is executed on a
consumer, this error message is logged.

error log on a consumer:
reindex userRoot: WARNING: Skipping entry "nsuniqueid=ffffffff-ffffffff-
ffffffff-ffffffff" which has no parent, ending at line 18 of file "id2entry.db"
reindex userRoot: WARNING: bad entry: ID 18

Due to this skip, the RUV entry is not found at the following start up
and a new RUV is generated by the MMR plugin. And the supplier finds the
generation ID mismatch.

error log on a supplier:
NSMMReplicationPlugin - agmt="cn=0_1" (HOST:PORT): The remote replica
has a different database generation ID than the local database. You
may have to reinitialize the remote replica, or the local replica.

Fix Description: Even if there is no parent entry, do not skip the RUV
entry as done for the suffix entry.

https://fedorahosted.org/389/ticket/48854

Reviewed by wibrown@redhat.com (Thank you, William!)

(cherry picked from commit ba3b8442abd4bd558d5467b07880d1c89613df9a)
(cherry picked from commit 14bc6ce2ba0e0613949dd45696b933e5a332a51c)

diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c
index 44fd35e..954abf2 100644
--- a/ldap/servers/slapd/back-ldbm/import-threads.c
+++ b/ldap/servers/slapd/back-ldbm/import-threads.c
@@ -2201,7 +2201,9 @@ import_foreman(void *param)
* we reject the entry but carry on since we've not stored
* anything related to this entry.
*/
- if (! slapi_be_issuffix(inst->inst_be, backentry_get_sdn(fi->entry))) {
+#define RUVRDN SLAPI_ATTR_UNIQUEID "=" RUV_STORAGE_ENTRY_UNIQUEID
+ if (!slapi_be_issuffix(inst->inst_be, backentry_get_sdn(fi->entry)) &&
+ strcasecmp(backentry_get_ndn(fi->entry), RUVRDN) /* NOT nsuniqueid=ffffffff-... */) {
import_log_notice(job, "WARNING: Skipping entry \"%s\" "
"which has no parent, ending at line %d "
"of file \"%s\"",
@@ -2227,8 +2229,7 @@ import_foreman(void *param)
goto cont; /* skip entry */
}
}
- if ((job->flags & FLAG_UPGRADEDNFORMAT) &&
- (LDBM_ERROR_FOUND_DUPDN == ret)) {
+ if ((job->flags & FLAG_UPGRADEDNFORMAT) && (LDBM_ERROR_FOUND_DUPDN == ret)) {
/*
* Duplicated DN is detected.
*

--
389-commits mailing list
389-commits@lists.fedoraproject.org
https://lists.fedoraproject.org/admin/lists/389-commits@lists.fedoraproject.org