[PATCH] samba-tool dbcheck: handle name conflict objects

Andrew Bartlett abartlet at samba.org
Tue Apr 1 22:25:51 MDT 2014

On Tue, 2014-04-01 at 13:32 +0200, Felix Botner wrote:
> Hi,
> here another attempt for a patch to handle conflict objects.

Without a source of conflict objects, I can't test it, but it looks good
so far.  Thanks!

> Am Montag, 31. März 2014, 21:59:24 schrieben Sie:
> > > > > Finally, as I mentioned before we also should have a test for this,
> > > > > running on and fixing real conflicts generated by
> > > > > source4/torture/drs/python/replica_sync.py, and on a test database
> > > > > (perhaps the same one you plan to submit for the missing objectclass).
> > > 
> > > This is the critical part - this will only happen rarely I hope, and we
> > > need tests to ensure it all works. 
> > 
> > Felix,
> > 
> > Do you need any more help reworking these patches or understanding what
> > is required in the tests?  I would like to get these in to Samba once
> > that is done.
> yes, unfortunately, i still need some time to make myself familiarize with the samba 
> testsuite, any help appreciated

The code to change is source4/torture/drs/python/replica_sync.py

This code calls our to other samba-tool commands (see drs_base.py).
What I want it to do is use your tool to clean up the conflicts once the
rest of the testing is done, then confirm that they have been cleaned
up, by re-running it. 

To make the conflict happen on one or the other DN, a sleep of 1sec
could be added, that should force the time to be the determining


Andrew Bartlett

Andrew Bartlett
Authentication Developer, Samba Team  http://samba.org
Samba Developer, Catalyst IT          http://catalyst.net.nz/services/samba

More information about the samba-technical mailing list