Subversion Repositories dev

Compare Revisions

Ignore whitespace Rev 16281 → Rev 16284

/branches/ucs-3.2/component/multi-master-replication/univention-multi-master/debian/changelog
1,3 → 1,9
univention-multi-master (1.0.121-1) unstable; urgency=low
 
* Bug #33580: remove NO_SUCH_OBJECT error handling, ignore temporary objects
 
-- Alexander Kläser <klaeser@univention.de> Wed, 26 Mar 2014 10:32:00 +0100
 
univention-multi-master (1.0.120-1) unstable; urgency=low
 
* Bug #33580: special treat for NO_SUCH_OBJECT errors
/branches/ucs-3.2/component/multi-master-replication/univention-multi-master/multimaster/auditlog.py
282,6 → 282,9
 
transaction = formatXMLTransaction(transaction)
dn = transaction.dn
if 'cn=temporary,cn=univention' in dn:
# ignore temporary objects
break
if _lastMD5sum:
transaction._xml.set('_previousMD5sum', _lastMD5sum)
_lastMD5sum = transaction.md5sum
/branches/ucs-3.2/component/multi-master-replication/univention-multi-master/multimaster/journal.py
700,15 → 700,6
_apply(resolvingTransaction)
# apply the original transaction (that might be marked as conflicted and thus will be ignored)
_apply(transaction)
except ldap.NO_SUCH_OBJECT as ex:
log('NO_SUCH_OBJECT error: %s' % ex, 'Journal,%s' % _transaction.origin)
if transaction.changeType == 'delete':
log('Ignoring transaction as object to be deleted does not exist: %r' % _transaction, 'Journal,%s' % _transaction.origin)
originHostDB.addTransaction(transaction)
self._applyTransactionToJournal(transaction)
self._dumpJournal()
else:
return False
except ldap.LDAPError as ex:
log('LDAP error: %s' % ex, 'Journal,%s' % _transaction.origin)
log('Requeueing transaction: %r' % _transaction, 'Journal,%s' % _transaction.origin)