bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
1 |
# Copyright (C) 2006 Canonical Ltd
|
2 |
||
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
||
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
||
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
|
1553.5.31
by Martin Pool
LockDir doc corrections |
17 |
"""On-disk mutex protecting a resource
|
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
18 |
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
19 |
bzr on-disk objects are locked by the existence of a directory with a
|
20 |
particular name within the control directory. We use this rather than OS
|
|
21 |
internal locks (such as flock etc) because they can be seen across all
|
|
22 |
transports, including http.
|
|
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
23 |
|
24 |
Objects can be read if there is only physical read access; therefore
|
|
25 |
readers can never be required to create a lock, though they will
|
|
26 |
check whether a writer is using the lock. Writers can't detect
|
|
27 |
whether anyone else is reading from the resource as they write.
|
|
28 |
This works because of ordering constraints that make sure readers
|
|
29 |
see a consistent view of existing data.
|
|
30 |
||
31 |
Waiting for a lock must be done by polling; this can be aborted after
|
|
32 |
a timeout.
|
|
33 |
||
34 |
Locks must always be explicitly released, typically from a try/finally
|
|
35 |
block -- they are not released from a finalizer or when Python
|
|
36 |
exits.
|
|
37 |
||
38 |
Locks may fail to be released if the process is abruptly terminated
|
|
39 |
(machine stop, SIGKILL) or if a remote transport becomes permanently
|
|
40 |
disconnected. There is therefore a method to break an existing lock.
|
|
41 |
This should rarely be used, and generally only with user approval.
|
|
42 |
Locks contain some information on when the lock was taken and by who
|
|
43 |
which may guide in deciding whether it can safely be broken. (This is
|
|
44 |
similar to the messages displayed by emacs and vim.) Note that if the
|
|
45 |
lock holder is still alive they will get no notification that the lock
|
|
46 |
has been broken and will continue their work -- so it is important to be
|
|
47 |
sure they are actually dead.
|
|
48 |
||
49 |
A lock is represented on disk by a directory of a particular name,
|
|
50 |
containing an information file. Taking a lock is done by renaming a
|
|
51 |
temporary directory into place. We use temporary directories because
|
|
52 |
for all known transports and filesystems we believe that exactly one
|
|
53 |
attempt to claim the lock will succeed and the others will fail. (Files
|
|
54 |
won't do because some filesystems or transports only have
|
|
55 |
rename-and-overwrite, making it hard to tell who won.)
|
|
56 |
||
57 |
The desired characteristics are:
|
|
58 |
||
59 |
* Locks are not reentrant. (That is, a client that tries to take a
|
|
60 |
lock it already holds may deadlock or fail.)
|
|
61 |
* Stale locks can be guessed at by a heuristic
|
|
62 |
* Lost locks can be broken by any client
|
|
63 |
* Failed lock operations leave little or no mess
|
|
64 |
* Deadlocks are avoided by having a timeout always in use, clients
|
|
65 |
desiring indefinite waits can retry or set a silly big timeout.
|
|
66 |
||
67 |
Storage formats use the locks, and also need to consider concurrency
|
|
68 |
issues underneath the lock. A format may choose not to use a lock
|
|
69 |
at all for some operations.
|
|
70 |
||
71 |
LockDirs always operate over a Transport. The transport may be readonly, in
|
|
72 |
which case the lock can be queried but not acquired.
|
|
73 |
||
74 |
Locks are identified by a path name, relative to a base transport.
|
|
75 |
||
76 |
Calling code will typically want to make sure there is exactly one LockDir
|
|
77 |
object per actual lock on disk. This module does nothing to prevent aliasing
|
|
78 |
and deadlocks will likely occur if the locks are aliased.
|
|
79 |
||
80 |
In the future we may add a "freshen" method which can be called
|
|
81 |
by a lock holder to check that their lock has not been broken, and to
|
|
82 |
update the timestamp within it.
|
|
83 |
||
|
1553.5.18
by Martin Pool
LockDir should use Transport.rename when releasing locks too. |
84 |
Example usage:
|
85 |
||
86 |
>>> from bzrlib.transport.memory import MemoryTransport
|
|
87 |
>>> # typically will be obtained from a BzrDir, Branch, etc
|
|
88 |
>>> t = MemoryTransport()
|
|
89 |
>>> l = LockDir(t, 'sample-lock')
|
|
90 |
>>> l.wait_lock()
|
|
91 |
>>> # do something here
|
|
92 |
>>> l.unlock()
|
|
93 |
||
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
94 |
"""
|
95 |
||
96 |
import os |
|
97 |
import time |
|
98 |
from StringIO import StringIO |
|
99 |
||
100 |
import bzrlib.config |
|
101 |
from bzrlib.errors import ( |
|
102 |
DirectoryNotEmpty, |
|
103 |
FileExists, |
|
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
104 |
LockBreakMismatch, |
|
1553.5.23
by Martin Pool
Start LockDir.confirm method and LockBroken exception |
105 |
LockBroken, |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
106 |
LockContention, |
107 |
LockError, |
|
108 |
LockNotHeld, |
|
109 |
NoSuchFile, |
|
110 |
UnlockableTransport, |
|
111 |
)
|
|
112 |
from bzrlib.transport import Transport |
|
113 |
from bzrlib.osutils import rand_chars |
|
114 |
from bzrlib.rio import RioWriter, read_stanza, Stanza |
|
115 |
||
116 |
# XXX: At the moment there is no consideration of thread safety on LockDir
|
|
117 |
# objects. This should perhaps be updated - e.g. if two threads try to take a
|
|
118 |
# lock at the same time they should *both* get it. But then that's unlikely
|
|
119 |
# to be a good idea.
|
|
120 |
||
121 |
# TODO: Transport could offer a simpler put() method that avoids the
|
|
122 |
# rename-into-place for cases like creating the lock template, where there is
|
|
123 |
# no chance that the file already exists.
|
|
124 |
||
125 |
# TODO: Perhaps store some kind of note like the bzr command line in the lock
|
|
126 |
# info?
|
|
127 |
||
128 |
# TODO: Some kind of callback run while polling a lock to show progress
|
|
129 |
# indicators.
|
|
130 |
||
|
1553.5.21
by Martin Pool
Put default LockDir timeouts in variables; increase timeout to 3min |
131 |
_DEFAULT_TIMEOUT_SECONDS = 300 |
132 |
_DEFAULT_POLL_SECONDS = 0.5 |
|
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
133 |
|
134 |
class LockDir(object): |
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
135 |
"""Write-lock guarding access to data.""" |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
136 |
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
137 |
__INFO_NAME = '/info' |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
138 |
|
139 |
def __init__(self, transport, path): |
|
140 |
"""Create a new LockDir object. |
|
141 |
||
142 |
The LockDir is initially unlocked - this just creates the object.
|
|
143 |
||
144 |
:param transport: Transport which will contain the lock
|
|
145 |
||
146 |
:param path: Path to the lock within the base directory of the
|
|
147 |
transport.
|
|
148 |
"""
|
|
149 |
assert isinstance(transport, Transport), \ |
|
150 |
("not a transport: %r" % transport) |
|
151 |
self.transport = transport |
|
152 |
self.path = path |
|
153 |
self._lock_held = False |
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
154 |
self._info_path = path + self.__INFO_NAME |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
155 |
self.nonce = rand_chars(20) |
156 |
||
157 |
def __repr__(self): |
|
158 |
return '%s(%s%s)' % (self.__class__.__name__, |
|
159 |
self.transport.base, |
|
160 |
self.path) |
|
161 |
||
|
1553.5.13
by Martin Pool
New Transport.rename that mustn't overwrite |
162 |
is_held = property(lambda self: self._lock_held) |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
163 |
|
164 |
def attempt_lock(self): |
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
165 |
"""Take the lock; fail if it's already held. |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
166 |
|
167 |
If you wish to block until the lock can be obtained, call wait_lock()
|
|
168 |
instead.
|
|
169 |
"""
|
|
170 |
if self.transport.is_readonly(): |
|
171 |
raise UnlockableTransport(self.transport) |
|
172 |
try: |
|
173 |
tmpname = '%s.pending.%s.tmp' % (self.path, rand_chars(20)) |
|
174 |
self.transport.mkdir(tmpname) |
|
175 |
sio = StringIO() |
|
176 |
self._prepare_info(sio) |
|
177 |
sio.seek(0) |
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
178 |
self.transport.put(tmpname + self.__INFO_NAME, sio) |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
179 |
# FIXME: this turns into os.rename on posix, but into a fancy rename
|
180 |
# on Windows that may overwrite existing directory trees.
|
|
181 |
# NB: posix rename will overwrite empty directories, but not
|
|
182 |
# non-empty directories.
|
|
183 |
self.transport.move(tmpname, self.path) |
|
184 |
self._lock_held = True |
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
185 |
self.confirm() |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
186 |
return
|
187 |
except (DirectoryNotEmpty, FileExists), e: |
|
188 |
pass
|
|
189 |
# fall through to here on contention
|
|
190 |
raise LockContention(self) |
|
191 |
||
192 |
def unlock(self): |
|
|
1553.5.30
by Martin Pool
docstring for LockDir.unlock |
193 |
"""Release a held lock |
194 |
"""
|
|
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
195 |
if not self._lock_held: |
196 |
raise LockNotHeld(self) |
|
197 |
# rename before deleting, because we can't atomically remove the whole
|
|
198 |
# tree
|
|
199 |
tmpname = '%s.releasing.%s.tmp' % (self.path, rand_chars(20)) |
|
|
1553.5.18
by Martin Pool
LockDir should use Transport.rename when releasing locks too. |
200 |
self.transport.rename(self.path, tmpname) |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
201 |
self._lock_held = False |
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
202 |
self.transport.delete(tmpname + self.__INFO_NAME) |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
203 |
self.transport.rmdir(tmpname) |
204 |
||
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
205 |
def force_break(self, dead_holder_info): |
|
1553.5.25
by Martin Pool
New LockDir.force_break and simple test case |
206 |
"""Release a lock held by another process. |
207 |
||
208 |
WARNING: This should only be used when the other process is dead; if
|
|
209 |
it still thinks it has the lock there will be two concurrent writers.
|
|
210 |
In general the user's approval should be sought for lock breaks.
|
|
211 |
||
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
212 |
dead_holder_info must be the result of a previous LockDir.peek() call;
|
213 |
this is used to check that it's still held by the same process that
|
|
214 |
the user decided was dead. If this is not the current holder,
|
|
215 |
LockBreakMismatch is raised.
|
|
216 |
||
|
1553.5.25
by Martin Pool
New LockDir.force_break and simple test case |
217 |
After the lock is broken it will not be held by any process.
|
218 |
It is possible that another process may sneak in and take the
|
|
219 |
lock before the breaking process acquires it.
|
|
220 |
"""
|
|
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
221 |
if not isinstance(dead_holder_info, dict): |
222 |
raise ValueError("dead_holder_info: %r" % dead_holder_info) |
|
|
1553.5.25
by Martin Pool
New LockDir.force_break and simple test case |
223 |
if self._lock_held: |
224 |
raise AssertionError("can't break own lock: %r" % self) |
|
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
225 |
current_info = self.peek() |
226 |
if current_info is None: |
|
|
1553.5.26
by Martin Pool
Breaking an already-released lock should just succeed |
227 |
# must have been recently released
|
228 |
return
|
|
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
229 |
if current_info != dead_holder_info: |
230 |
raise LockBreakMismatch(self, current_info, dead_holder_info) |
|
|
1553.5.25
by Martin Pool
New LockDir.force_break and simple test case |
231 |
tmpname = '%s.broken.%s.tmp' % (self.path, rand_chars(20)) |
232 |
self.transport.rename(self.path, tmpname) |
|
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
233 |
# check that we actually broke the right lock, not someone else;
|
234 |
# there's a small race window between checking it and doing the
|
|
235 |
# rename.
|
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
236 |
broken_info_path = tmpname + self.__INFO_NAME |
237 |
broken_info = self._read_info_file(broken_info_path) |
|
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
238 |
if broken_info != dead_holder_info: |
239 |
raise LockBreakMismatch(self, broken_info, dead_holder_info) |
|
240 |
self.transport.delete(broken_info_path) |
|
|
1553.5.25
by Martin Pool
New LockDir.force_break and simple test case |
241 |
self.transport.rmdir(tmpname) |
242 |
||
|
1553.5.20
by Martin Pool
Start adding LockDir.confirm() method |
243 |
def confirm(self): |
244 |
"""Make sure that the lock is still held by this locker. |
|
245 |
||
246 |
This should only fail if the lock was broken by user intervention,
|
|
247 |
or if the lock has been affected by a bug.
|
|
248 |
||
249 |
If the lock is not thought to be held, raises LockNotHeld. If
|
|
250 |
the lock is thought to be held but has been broken, raises
|
|
251 |
LockBroken.
|
|
252 |
"""
|
|
253 |
if not self._lock_held: |
|
254 |
raise LockNotHeld(self) |
|
|
1553.5.23
by Martin Pool
Start LockDir.confirm method and LockBroken exception |
255 |
info = self.peek() |
256 |
if info is None: |
|
257 |
# no lock there anymore!
|
|
258 |
raise LockBroken(self) |
|
259 |
if info.get('nonce') != self.nonce: |
|
260 |
# there is a lock, but not ours
|
|
261 |
raise LockBroken(self) |
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
262 |
|
263 |
def _read_info_file(self, path): |
|
264 |
return self._parse_info(self.transport.get(path)) |
|
|
1553.5.20
by Martin Pool
Start adding LockDir.confirm() method |
265 |
|
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
266 |
def peek(self): |
267 |
"""Check if the lock is held by anyone. |
|
268 |
|
|
269 |
If it is held, this returns the lock info structure as a rio Stanza,
|
|
270 |
which contains some information about the current lock holder.
|
|
271 |
Otherwise returns None.
|
|
272 |
"""
|
|
273 |
try: |
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
274 |
info = self._read_info_file(self._info_path) |
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
275 |
assert isinstance(info, dict), \ |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
276 |
"bad parse result %r" % info |
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
277 |
return info |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
278 |
except NoSuchFile, e: |
279 |
return None |
|
280 |
||
281 |
def _prepare_info(self, outf): |
|
282 |
"""Write information about a pending lock to a temporary file. |
|
283 |
"""
|
|
284 |
import socket |
|
285 |
# XXX: is creating this here inefficient?
|
|
286 |
config = bzrlib.config.GlobalConfig() |
|
287 |
s = Stanza(hostname=socket.gethostname(), |
|
288 |
pid=str(os.getpid()), |
|
289 |
start_time=str(int(time.time())), |
|
290 |
nonce=self.nonce, |
|
291 |
user=config.user_email(), |
|
292 |
)
|
|
293 |
RioWriter(outf).write_stanza(s) |
|
294 |
||
295 |
def _parse_info(self, info_file): |
|
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
296 |
return read_stanza(info_file.readlines()).as_dict() |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
297 |
|
|
1553.5.21
by Martin Pool
Put default LockDir timeouts in variables; increase timeout to 3min |
298 |
def wait_lock(self, timeout=_DEFAULT_TIMEOUT_SECONDS, |
299 |
poll=_DEFAULT_POLL_SECONDS): |
|
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
300 |
"""Wait a certain period for a lock. |
301 |
||
302 |
If the lock can be acquired within the bounded time, it
|
|
303 |
is taken and this returns. Otherwise, LockContention
|
|
304 |
is raised. Either way, this function should return within
|
|
305 |
approximately `timeout` seconds. (It may be a bit more if
|
|
306 |
a transport operation takes a long time to complete.)
|
|
307 |
"""
|
|
308 |
# XXX: the transport interface doesn't let us guard
|
|
309 |
# against operations there taking a long time.
|
|
310 |
deadline = time.time() + timeout |
|
311 |
while True: |
|
312 |
try: |
|
313 |
self.attempt_lock() |
|
314 |
return
|
|
315 |
except LockContention: |
|
316 |
pass
|
|
317 |
if time.time() + poll < deadline: |
|
318 |
time.sleep(poll) |
|
319 |
else: |
|
320 |
raise LockContention(self) |
|
321 |
||
322 |
def wait(self, timeout=20, poll=0.5): |
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
323 |
"""Wait a certain period for a lock to be released.""" |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
324 |
# XXX: the transport interface doesn't let us guard
|
325 |
# against operations there taking a long time.
|
|
326 |
deadline = time.time() + timeout |
|
327 |
while True: |
|
328 |
if self.peek(): |
|
329 |
return
|
|
330 |
if time.time() + poll < deadline: |
|
331 |
time.sleep(poll) |
|
332 |
else: |
|
333 |
raise LockContention(self) |
|
|
1553.5.25
by Martin Pool
New LockDir.force_break and simple test case |
334 |