facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 09:17:30 +03:00
Code Issues Projects Releases Wiki Activity

hgsql: move lock order check to sql locks

Browse Source 
Summary:
The lock check should be making sure local repo lock is taken before the SQL
lock.

The current code does not work well. One of the reasons is because repo locks
can be nested.

Clean up the lock check so we now check at SQL lock functions to make sure we
still have the repo lock held. This way we don't have to replace the repo
lock functions.

It is not working yet because there are other code paths to fix.

Reviewed By: phillco

Differential Revision: D10108593

fbshipit-source-id: 489e4f27c06671191cf2084c7a726381be24a81f
This commit is contained in:
Jun Wu 2018-09-28 16:46:41 -07:00 committed by Facebook Github Bot
parent a77d98c8c9
commit 0521236fdc
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hgext/hgsql.py
View File

@ -717,6 +717,7 @@ def wraprepo(repo):
self.heldlocks.add(name)
def sqlwritelock(self, trysync=False):
self._enforcelocallocktaken()
self._sqllock(writelock, trysync)
def _hassqllock(self, name, checkserver=True):
@ -753,25 +754,17 @@ def wraprepo(repo):
self.sqlpostrelease = []
def sqlwriteunlock(self):
repo._sqlunlock(writelock)
self._enforcelocallocktaken()
self._sqlunlock(writelock)
def lock(self, *args, **kwargs):
wl = self._wlockref and self._wlockref()
if (
not self._issyncing
and not (wl is not None and wl.held)
and not self.hassqlwritelock(checkserver=False)
):
self._recordbadlockorder()
return super(sqllocalrepo, self).lock(*args, **kwargs)
def wlock(self, *args, **kwargs):
if not self._issyncing and not self.hassqlwritelock(checkserver=False):
self._recordbadlockorder()
return super(sqllocalrepo, self).wlock(*args, **kwargs)
def _recordbadlockorder(self):
self.ui.debug("invalid lock order\n")
def _enforcelocallocktaken(self):
if not getattr(self, "_checklockorder", False):
return
if self._issyncing:
return
if self._currentlock(self._lockref):
return
raise error.ProgrammingError("invalid lock order")
def transaction(self, *args, **kwargs):
tr = super(sqllocalrepo, self).transaction(*args, **kwargs)