Lars,<br><blockquote style="margin:0 0 0 40px;border:none;padding:0px">I did not make that change myself but I felt that it would be safe to resolve the prefixes in get_tempfile_name() and paranoid_file() functions rather than expecting that the caller functions would resolve the prefixes before passing the input parameters.<br>
<br>Centralizing the logic has the other benefits like :<br><ul><li>resolving environment variables</li><li>resolving symbolic links</li><li>resolving relative paths, etc</li></ul></blockquote>Regards,<br>Samba<br><br>==================================================================================<br>
<div class="gmail_quote">On Mon, Jun 18, 2012 at 2:27 PM, Samba <span dir="ltr"><<a href="mailto:saasira@gmail.com" target="_blank">saasira@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi Lars,<br><br><blockquote style="margin:0 0 0 40px;border:none;padding:0px">I managed to modify the patch submitted by <i>Dennis Schafroth </i>to also consider the configured 'tempdir' directive in csync2 config files. Further, Dennis's patch did not fix the issue of replication to deleted subdirectories on slave server, which this patch has fixed. On the otherhand, this patch also includes the fix given by Dennis for backing up of prefixed locations.</blockquote>
<blockquote style="margin:0 0 0 40px;border:none;padding:0px"><br>The attached patch fixes the issue previously mentioned in this mail thread, namely 'fail to sync when a subdirectory gets deleted either on master or slave servers, WITH OR WITHOUT PREFIX MAPPING'.</blockquote>
<blockquote style="margin:0 0 0 40px;border:none;padding:0px">
<br>I tested it for regression and am confident that this did not introduce any new issues; <br><br>Here are the test cases we have run
after upgrading the Csync2 rpm [deleted subdir fix]:</blockquote><blockquote style="margin:0 0 0 40px;border:none;padding:0px"></blockquote> <br><blockquote style="margin:0 0 0 40px;border:none;padding:0px"></blockquote>
<br><table border="1" cellspacing="0" cellpadding="0" style="margin-left:0.5in;border-collapse:collapse;border-top-style:none;border-right-style:none;border-bottom-style:none;border-left-style:none;border-width:initial;border-color:initial">
<tbody><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal" align="center" style="text-align:center"><span style="font-size:14.0pt">Self</span></p>
</td><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-left:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal" align="center" style="text-align:center"><span style="font-size:14.0pt">Peer</span></p>
</td><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-left:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal" align="center" style="text-align:center"><span style="font-size:14.0pt">Result</span></p>
</td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">file
deleted on master </span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">no
changes to that file on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal">SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">file
deleted on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">changes
happened to that file on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal">SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">file
deleted on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">file
deleted on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal">
SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">file
changed on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">no
changes to that file on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal">SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">file
changed on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">file
changed on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal">
SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">file
chaned on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal">
<span style="font-family:Arial,sans-serif">file
deleted on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal">
SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">subdir
deleted on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">no
changes to that subdir or files under it on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal">SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">subdir
deleted on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">files
under that subdir are modified on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal">SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">subdir
deleted on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">subdir
deleted on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal">
SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">files
under that subdir are modified on master</span></p><p class="MsoNormal"> </p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">subdir
deleted on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal">
SUCCESS [synced only the file that was modified on master,
did not sync the complete subdirectory </p><p class="MsoNormal">TODO: sync the complete subdir tree when it is detected
that a subdir has been deleted on the slave]</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">subdir
deleted on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">subdir
deleted on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal">
SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">dirtree
deleted on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">no
changes on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal">
SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">dirtree
deleted on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">some
files in the hierarchy changed on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal">SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">dirtree
modified on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">part
of the dirtree is deleted on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal">SUCCESS [synced only the file that was modified on master,
did not sync the complete subdirectory </p><p class="MsoNormal">TODO: sync the complete subdir tree when it is detected
that a subdir has been deleted on the slave]</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"><span style="font-family:Arial,sans-serif">dirtree
deleted on master</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"><span style="font-family:Arial,sans-serif">dirtree
deleted on slave</span></p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal">
SUCCESS</p></td></tr><tr><td width="213" valign="top" style="width:159.6pt;border:solid windowtext 1.0pt;border-top:none;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal"> </p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt">
<p class="MsoNormal"> </p></td><td width="213" valign="top" style="width:159.6pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0in 5.4pt 0in 5.4pt"><p class="MsoNormal">
</p></td></tr></tbody></table><blockquote style="margin:0 0 0 40px;border:none;padding:0px"></blockquote> <br><blockquote style="margin:0 0 0 40px;border:none;padding:0px"> <br><p class="MsoNormal" style="margin-left:.5in">
</p>
Please review the attached patch and give feedback [ this is my first attempt at writing any usable C program, so please suggest appropriate corrections if any].<br><br>I hope this patch gets committed to trunk soon.<br>
<br></blockquote>Thanks and Regards,<br>Samba<br><blockquote style="margin:0 0 0 40px;border:none;padding:0px"><br></blockquote>===================================================================================<div class="HOEnZb">
<div class="h5"><br>On Tue, Jun 5, 2012 at 1:19 PM, Lars Ellenberg <span dir="ltr"><<a href="mailto:lars.ellenberg@linbit.com" target="_blank">lars.ellenberg@linbit.com</a>></span> wrote:<br>
<div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div>On Sat, Jun 02, 2012 at 06:09:37AM +0530, Samba wrote:<br>
> Sorry for flooding the list;<br>
<br>
</div>Oh, please keep it coming ;)<br>
<div><br>
> I will review,<br>
> test and verify the patch in a bit more detail and send my comments in a<br>
> couple of days.<br>
<br>
</div>Thanks,<br>
<div><br>
<br>
--<br>
: Lars Ellenberg<br>
: LINBIT | Your Way to High Availability<br>
: DRBD/HA support and consulting <a href="http://www.linbit.com" target="_blank">http://www.linbit.com</a><br>
<br>
</div>DRBD® and LINBIT® are registered trademarks of LINBIT, Austria.<br>
<div><div>_______________________________________________<br>
Csync2 mailing list<br>
<a href="mailto:Csync2@lists.linbit.com" target="_blank">Csync2@lists.linbit.com</a><br>
<a href="http://lists.linbit.com/mailman/listinfo/csync2" target="_blank">http://lists.linbit.com/mailman/listinfo/csync2</a><br>
</div></div></blockquote></div><br>
</div></div></blockquote></div><br>