Patchwork [7,of,7,STABLE] bookmarks: actual fix for race condition deleting bookmark

login
register
mail settings
Submitter Yuya Nishihara
Date June 23, 2019, 11:18 p.m.
Message ID <20190624081819.4cd9637eb3c009917c4ed364@tcha.org>
Download mbox | patch
Permalink /patch/40654/
State New
Headers show

Comments

Yuya Nishihara - June 23, 2019, 11:18 p.m.
On Sun, 23 Jun 2019 18:42:16 -0400, Matt Harbison wrote:
> On Thu, 20 Jun 2019 22:04:14 -0400, Pierre-Yves David  
> <pierre-yves.david@ens-lyon.org> wrote:
> 
> > # HG changeset patch
> > # User Pierre-Yves David <pierre-yves.david@octobus.net>
> > # Date 1561081840 -7200
> > #      Fri Jun 21 03:50:40 2019 +0200
> > # Branch stable
> > # Node ID 8611e1183db406463655af0b196cba6fcd2cf8a9
> > # Parent  ddd62edfa406e3b84483cafcaa93927ca917d0cd
> > # EXP-Topic book-del-stable
> > # Available At https://bitbucket.org/octobus/mercurial-devel/
> > #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r  
> > 8611e1183db4
> > bookmarks: actual fix for race condition deleting bookmark
> 
> I have no idea why, but this is the commit that broke the Windows tests.
> 
> https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/1480

Maybe backout this patch? I suspect that we still rely on in-memory changelog
data to be flushed out of the transaction.

Windows has no filecache, which behavior can be tested with this change:
Pierre-Yves David - June 24, 2019, 10:40 a.m.
Looks like yuya patch reproduce the issue on Linux. I have taken my best 
shovel and started digging.

On 6/24/19 1:18 AM, Yuya Nishihara wrote:
> On Sun, 23 Jun 2019 18:42:16 -0400, Matt Harbison wrote:
>> On Thu, 20 Jun 2019 22:04:14 -0400, Pierre-Yves David
>> <pierre-yves.david@ens-lyon.org> wrote:
>>
>>> # HG changeset patch
>>> # User Pierre-Yves David <pierre-yves.david@octobus.net>
>>> # Date 1561081840 -7200
>>> #      Fri Jun 21 03:50:40 2019 +0200
>>> # Branch stable
>>> # Node ID 8611e1183db406463655af0b196cba6fcd2cf8a9
>>> # Parent  ddd62edfa406e3b84483cafcaa93927ca917d0cd
>>> # EXP-Topic book-del-stable
>>> # Available At https://bitbucket.org/octobus/mercurial-devel/
>>> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r
>>> 8611e1183db4
>>> bookmarks: actual fix for race condition deleting bookmark
>>
>> I have no idea why, but this is the commit that broke the Windows tests.
>>
>> https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/1480
> 
> Maybe backout this patch? I suspect that we still rely on in-memory changelog
> data to be flushed out of the transaction.
> 
> Windows has no filecache, which behavior can be tested with this change:
> 
> diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
> --- a/mercurial/scmutil.py
> +++ b/mercurial/scmutil.py
> @@ -1356,6 +1356,7 @@ class filecachesubentry(object):
>               self.cachestat = filecachesubentry.stat(self.path)
>   
>       def cacheable(self):
> +        return False
>           if self._cacheable is not None:
>               return self._cacheable
>   
>

Patch

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -1356,6 +1356,7 @@  class filecachesubentry(object):
             self.cachestat = filecachesubentry.stat(self.path)
 
     def cacheable(self):
+        return False
         if self._cacheable is not None:
             return self._cacheable