1553.5.12
by Martin Pool
New LockDir locking mechanism |
1 |
# Copyright (C) 2006 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
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')
|
|
1553.5.61
by Martin Pool
Locks protecting LockableFiles must now be explicitly created before use. |
90 |
>>> l.create()
|
1553.5.18
by Martin Pool
LockDir should use Transport.rename when releasing locks too. |
91 |
>>> l.wait_lock()
|
92 |
>>> # do something here
|
|
93 |
>>> l.unlock()
|
|
94 |
||
1553.5.12
by Martin Pool
New LockDir locking mechanism |
95 |
"""
|
96 |
||
97 |
import os |
|
98 |
import time |
|
1957.1.1
by John Arbash Meinel
Report to the user when we are spinning on a lock |
99 |
from cStringIO import StringIO |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
100 |
|
2055.2.1
by John Arbash Meinel
Make LockDir less sensitive to invalid configuration of email |
101 |
from bzrlib import ( |
102 |
errors, |
|
103 |
)
|
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
104 |
import bzrlib.config |
105 |
from bzrlib.errors import ( |
|
106 |
DirectoryNotEmpty, |
|
107 |
FileExists, |
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
108 |
LockBreakMismatch, |
1553.5.23
by Martin Pool
Start LockDir.confirm method and LockBroken exception |
109 |
LockBroken, |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
110 |
LockContention, |
111 |
LockNotHeld, |
|
112 |
NoSuchFile, |
|
1662.1.12
by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile |
113 |
PathError, |
1558.10.1
by Aaron Bentley
Handle lockdirs over NFS properly |
114 |
ResourceBusy, |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
115 |
UnlockableTransport, |
116 |
)
|
|
1957.1.1
by John Arbash Meinel
Report to the user when we are spinning on a lock |
117 |
from bzrlib.trace import mutter, note |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
118 |
from bzrlib.transport import Transport |
1957.1.5
by John Arbash Meinel
Create a helper function for formatting lock information |
119 |
from bzrlib.osutils import rand_chars, format_delta |
1993.1.2
by John Arbash Meinel
Use Stanza.to_string() rather than a RioWriter |
120 |
from bzrlib.rio import read_stanza, Stanza |
2094.3.5
by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used |
121 |
import bzrlib.ui |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
122 |
|
1957.1.15
by John Arbash Meinel
Review feedback from Robert |
123 |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
124 |
# XXX: At the moment there is no consideration of thread safety on LockDir
|
125 |
# objects. This should perhaps be updated - e.g. if two threads try to take a
|
|
126 |
# lock at the same time they should *both* get it. But then that's unlikely
|
|
127 |
# to be a good idea.
|
|
128 |
||
129 |
# TODO: Perhaps store some kind of note like the bzr command line in the lock
|
|
130 |
# info?
|
|
131 |
||
132 |
# TODO: Some kind of callback run while polling a lock to show progress
|
|
133 |
# indicators.
|
|
134 |
||
1553.5.59
by Martin Pool
Pass file/mode bits through to creation of lock files/dirs |
135 |
# TODO: Make sure to pass the right file and directory mode bits to all
|
136 |
# files/dirs created.
|
|
137 |
||
1957.1.15
by John Arbash Meinel
Review feedback from Robert |
138 |
|
139 |
_DEFAULT_TIMEOUT_SECONDS = 300 |
|
1957.1.9
by John Arbash Meinel
Change default timeouts, and report differently the first failure |
140 |
_DEFAULT_POLL_SECONDS = 1.0 |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
141 |
|
1957.1.15
by John Arbash Meinel
Review feedback from Robert |
142 |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
143 |
class LockDir(object): |
1553.5.33
by Martin Pool
LockDir review comment fixes |
144 |
"""Write-lock guarding access to data."""
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
145 |
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
146 |
__INFO_NAME = '/info' |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
147 |
|
1553.5.59
by Martin Pool
Pass file/mode bits through to creation of lock files/dirs |
148 |
def __init__(self, transport, path, file_modebits=0644, dir_modebits=0755): |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
149 |
"""Create a new LockDir object.
|
150 |
||
151 |
The LockDir is initially unlocked - this just creates the object.
|
|
152 |
||
153 |
:param transport: Transport which will contain the lock
|
|
154 |
||
155 |
:param path: Path to the lock within the base directory of the
|
|
156 |
transport.
|
|
157 |
"""
|
|
158 |
assert isinstance(transport, Transport), \ |
|
159 |
("not a transport: %r" % transport) |
|
160 |
self.transport = transport |
|
161 |
self.path = path |
|
162 |
self._lock_held = False |
|
1553.5.54
by Martin Pool
Add LockDir.read_lock fake method |
163 |
self._fake_read_lock = False |
1553.5.58
by Martin Pool
Change LockDirs to format "lock-name/held/info" |
164 |
self._held_dir = path + '/held' |
165 |
self._held_info_path = self._held_dir + self.__INFO_NAME |
|
1553.5.59
by Martin Pool
Pass file/mode bits through to creation of lock files/dirs |
166 |
self._file_modebits = file_modebits |
167 |
self._dir_modebits = dir_modebits |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
168 |
self.nonce = rand_chars(20) |
169 |
||
1957.1.1
by John Arbash Meinel
Report to the user when we are spinning on a lock |
170 |
self._report_function = note |
171 |
||
1553.5.12
by Martin Pool
New LockDir locking mechanism |
172 |
def __repr__(self): |
173 |
return '%s(%s%s)' % (self.__class__.__name__, |
|
174 |
self.transport.base, |
|
175 |
self.path) |
|
176 |
||
1553.5.13
by Martin Pool
New Transport.rename that mustn't overwrite |
177 |
is_held = property(lambda self: self._lock_held) |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
178 |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
179 |
def create(self, mode=None): |
1553.5.58
by Martin Pool
Change LockDirs to format "lock-name/held/info" |
180 |
"""Create the on-disk lock.
|
181 |
||
182 |
This is typically only called when the object/directory containing the
|
|
183 |
directory is first created. The lock is not held when it's created.
|
|
184 |
"""
|
|
185 |
if self.transport.is_readonly(): |
|
186 |
raise UnlockableTransport(self.transport) |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
187 |
self.transport.mkdir(self.path, mode=mode) |
1553.5.58
by Martin Pool
Change LockDirs to format "lock-name/held/info" |
188 |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
189 |
def attempt_lock(self): |
1553.5.33
by Martin Pool
LockDir review comment fixes |
190 |
"""Take the lock; fail if it's already held.
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
191 |
|
192 |
If you wish to block until the lock can be obtained, call wait_lock()
|
|
193 |
instead.
|
|
194 |
"""
|
|
1553.5.54
by Martin Pool
Add LockDir.read_lock fake method |
195 |
if self._fake_read_lock: |
196 |
raise LockContention(self) |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
197 |
if self.transport.is_readonly(): |
198 |
raise UnlockableTransport(self.transport) |
|
199 |
try: |
|
1553.5.58
by Martin Pool
Change LockDirs to format "lock-name/held/info" |
200 |
tmpname = '%s/pending.%s.tmp' % (self.path, rand_chars(20)) |
1955.1.1
by John Arbash Meinel
LockDir can create the root directory if it fails to create a pending directory due to NoSuchFile. |
201 |
try: |
202 |
self.transport.mkdir(tmpname) |
|
203 |
except NoSuchFile: |
|
204 |
# This may raise a FileExists exception
|
|
205 |
# which is okay, it will be caught later and determined
|
|
206 |
# to be a LockContention.
|
|
207 |
self.create(mode=self._dir_modebits) |
|
208 |
||
209 |
# After creating the lock directory, try again
|
|
210 |
self.transport.mkdir(tmpname) |
|
211 |
||
1993.1.2
by John Arbash Meinel
Use Stanza.to_string() rather than a RioWriter |
212 |
info_bytes = self._prepare_info() |
1993.1.1
by John Arbash Meinel
Use put_file_non_atomic in lockdir() to save some sftp round trips |
213 |
# We use put_file_non_atomic because we just created a new unique
|
214 |
# directory so we don't have to worry about files existing there.
|
|
215 |
# We'll rename the whole directory into place to get atomic
|
|
216 |
# properties
|
|
1993.1.2
by John Arbash Meinel
Use Stanza.to_string() rather than a RioWriter |
217 |
self.transport.put_bytes_non_atomic(tmpname + self.__INFO_NAME, |
218 |
info_bytes) |
|
1955.1.1
by John Arbash Meinel
LockDir can create the root directory if it fails to create a pending directory due to NoSuchFile. |
219 |
|
1553.5.58
by Martin Pool
Change LockDirs to format "lock-name/held/info" |
220 |
self.transport.rename(tmpname, self._held_dir) |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
221 |
self._lock_held = True |
1553.5.33
by Martin Pool
LockDir review comment fixes |
222 |
self.confirm() |
1551.10.3
by Aaron Bentley
Lock attempts don't treat permission problems as lock contention |
223 |
except errors.PermissionDenied: |
224 |
raise
|
|
1662.1.12
by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile |
225 |
except (PathError, DirectoryNotEmpty, FileExists, ResourceBusy), e: |
226 |
mutter("contention on %r: %s", self, e) |
|
227 |
raise LockContention(self) |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
228 |
|
229 |
def unlock(self): |
|
1553.5.30
by Martin Pool
docstring for LockDir.unlock |
230 |
"""Release a held lock
|
231 |
"""
|
|
1553.5.54
by Martin Pool
Add LockDir.read_lock fake method |
232 |
if self._fake_read_lock: |
233 |
self._fake_read_lock = False |
|
234 |
return
|
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
235 |
if not self._lock_held: |
236 |
raise LockNotHeld(self) |
|
237 |
# rename before deleting, because we can't atomically remove the whole
|
|
238 |
# tree
|
|
1553.5.58
by Martin Pool
Change LockDirs to format "lock-name/held/info" |
239 |
tmpname = '%s/releasing.%s.tmp' % (self.path, rand_chars(20)) |
1687.1.3
by Robert Collins
Make LockDir.unlock check the lock is still intact. |
240 |
# gotta own it to unlock
|
241 |
self.confirm() |
|
1553.5.58
by Martin Pool
Change LockDirs to format "lock-name/held/info" |
242 |
self.transport.rename(self._held_dir, tmpname) |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
243 |
self._lock_held = False |
1553.5.33
by Martin Pool
LockDir review comment fixes |
244 |
self.transport.delete(tmpname + self.__INFO_NAME) |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
245 |
self.transport.rmdir(tmpname) |
246 |
||
1687.1.5
by Robert Collins
Add break_lock utility function to LockDir. |
247 |
def break_lock(self): |
248 |
"""Break a lock not held by this instance of LockDir.
|
|
249 |
||
250 |
This is a UI centric function: it uses the bzrlib.ui.ui_factory to
|
|
251 |
prompt for input if a lock is detected and there is any doubt about
|
|
252 |
it possibly being still active.
|
|
253 |
"""
|
|
1687.1.6
by Robert Collins
Extend LockableFiles to support break_lock() calls. |
254 |
self._check_not_locked() |
1687.1.5
by Robert Collins
Add break_lock utility function to LockDir. |
255 |
holder_info = self.peek() |
256 |
if holder_info is not None: |
|
1957.1.5
by John Arbash Meinel
Create a helper function for formatting lock information |
257 |
lock_info = '\n'.join(self._format_lock_info(holder_info)) |
258 |
if bzrlib.ui.ui_factory.get_boolean("Break %s" % lock_info): |
|
1687.1.5
by Robert Collins
Add break_lock utility function to LockDir. |
259 |
self.force_break(holder_info) |
260 |
||
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
261 |
def force_break(self, dead_holder_info): |
1553.5.25
by Martin Pool
New LockDir.force_break and simple test case |
262 |
"""Release a lock held by another process.
|
263 |
||
264 |
WARNING: This should only be used when the other process is dead; if
|
|
265 |
it still thinks it has the lock there will be two concurrent writers.
|
|
266 |
In general the user's approval should be sought for lock breaks.
|
|
267 |
||
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
268 |
dead_holder_info must be the result of a previous LockDir.peek() call;
|
269 |
this is used to check that it's still held by the same process that
|
|
270 |
the user decided was dead. If this is not the current holder,
|
|
271 |
LockBreakMismatch is raised.
|
|
272 |
||
1553.5.25
by Martin Pool
New LockDir.force_break and simple test case |
273 |
After the lock is broken it will not be held by any process.
|
274 |
It is possible that another process may sneak in and take the
|
|
275 |
lock before the breaking process acquires it.
|
|
276 |
"""
|
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
277 |
if not isinstance(dead_holder_info, dict): |
278 |
raise ValueError("dead_holder_info: %r" % dead_holder_info) |
|
1687.1.6
by Robert Collins
Extend LockableFiles to support break_lock() calls. |
279 |
self._check_not_locked() |
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
280 |
current_info = self.peek() |
281 |
if current_info is None: |
|
1553.5.26
by Martin Pool
Breaking an already-released lock should just succeed |
282 |
# must have been recently released
|
283 |
return
|
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
284 |
if current_info != dead_holder_info: |
285 |
raise LockBreakMismatch(self, current_info, dead_holder_info) |
|
1553.5.58
by Martin Pool
Change LockDirs to format "lock-name/held/info" |
286 |
tmpname = '%s/broken.%s.tmp' % (self.path, rand_chars(20)) |
287 |
self.transport.rename(self._held_dir, tmpname) |
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
288 |
# check that we actually broke the right lock, not someone else;
|
289 |
# there's a small race window between checking it and doing the
|
|
290 |
# rename.
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
291 |
broken_info_path = tmpname + self.__INFO_NAME |
292 |
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. |
293 |
if broken_info != dead_holder_info: |
294 |
raise LockBreakMismatch(self, broken_info, dead_holder_info) |
|
295 |
self.transport.delete(broken_info_path) |
|
1553.5.25
by Martin Pool
New LockDir.force_break and simple test case |
296 |
self.transport.rmdir(tmpname) |
297 |
||
1687.1.6
by Robert Collins
Extend LockableFiles to support break_lock() calls. |
298 |
def _check_not_locked(self): |
299 |
"""If the lock is held by this instance, raise an error."""
|
|
300 |
if self._lock_held: |
|
301 |
raise AssertionError("can't break own lock: %r" % self) |
|
302 |
||
1553.5.20
by Martin Pool
Start adding LockDir.confirm() method |
303 |
def confirm(self): |
304 |
"""Make sure that the lock is still held by this locker.
|
|
305 |
||
306 |
This should only fail if the lock was broken by user intervention,
|
|
307 |
or if the lock has been affected by a bug.
|
|
308 |
||
309 |
If the lock is not thought to be held, raises LockNotHeld. If
|
|
310 |
the lock is thought to be held but has been broken, raises
|
|
311 |
LockBroken.
|
|
312 |
"""
|
|
313 |
if not self._lock_held: |
|
314 |
raise LockNotHeld(self) |
|
1553.5.23
by Martin Pool
Start LockDir.confirm method and LockBroken exception |
315 |
info = self.peek() |
316 |
if info is None: |
|
317 |
# no lock there anymore!
|
|
318 |
raise LockBroken(self) |
|
319 |
if info.get('nonce') != self.nonce: |
|
320 |
# there is a lock, but not ours
|
|
321 |
raise LockBroken(self) |
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
322 |
|
323 |
def _read_info_file(self, path): |
|
1553.5.58
by Martin Pool
Change LockDirs to format "lock-name/held/info" |
324 |
"""Read one given info file.
|
325 |
||
326 |
peek() reads the info file of the lock holder, if any.
|
|
327 |
"""
|
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
328 |
return self._parse_info(self.transport.get(path)) |
1553.5.20
by Martin Pool
Start adding LockDir.confirm() method |
329 |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
330 |
def peek(self): |
331 |
"""Check if the lock is held by anyone.
|
|
332 |
|
|
333 |
If it is held, this returns the lock info structure as a rio Stanza,
|
|
334 |
which contains some information about the current lock holder.
|
|
335 |
Otherwise returns None.
|
|
336 |
"""
|
|
337 |
try: |
|
1553.5.58
by Martin Pool
Change LockDirs to format "lock-name/held/info" |
338 |
info = self._read_info_file(self._held_info_path) |
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
339 |
assert isinstance(info, dict), \ |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
340 |
"bad parse result %r" % info |
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
341 |
return info |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
342 |
except NoSuchFile, e: |
343 |
return None |
|
344 |
||
1993.1.2
by John Arbash Meinel
Use Stanza.to_string() rather than a RioWriter |
345 |
def _prepare_info(self): |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
346 |
"""Write information about a pending lock to a temporary file.
|
347 |
"""
|
|
348 |
import socket |
|
349 |
# XXX: is creating this here inefficient?
|
|
350 |
config = bzrlib.config.GlobalConfig() |
|
2055.2.1
by John Arbash Meinel
Make LockDir less sensitive to invalid configuration of email |
351 |
try: |
352 |
user = config.user_email() |
|
2055.2.2
by John Arbash Meinel
Switch extract_email_address() to use a more specific exception |
353 |
except errors.NoEmailInUsername: |
2055.2.1
by John Arbash Meinel
Make LockDir less sensitive to invalid configuration of email |
354 |
user = config.username() |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
355 |
s = Stanza(hostname=socket.gethostname(), |
356 |
pid=str(os.getpid()), |
|
357 |
start_time=str(int(time.time())), |
|
358 |
nonce=self.nonce, |
|
2055.2.1
by John Arbash Meinel
Make LockDir less sensitive to invalid configuration of email |
359 |
user=user, |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
360 |
)
|
1993.1.2
by John Arbash Meinel
Use Stanza.to_string() rather than a RioWriter |
361 |
return s.to_string() |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
362 |
|
363 |
def _parse_info(self, info_file): |
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
364 |
return read_stanza(info_file.readlines()).as_dict() |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
365 |
|
1957.1.17
by John Arbash Meinel
Change tests that expect locking to fail to timeout sooner. |
366 |
def wait_lock(self, timeout=None, poll=None): |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
367 |
"""Wait a certain period for a lock.
|
368 |
||
369 |
If the lock can be acquired within the bounded time, it
|
|
370 |
is taken and this returns. Otherwise, LockContention
|
|
371 |
is raised. Either way, this function should return within
|
|
372 |
approximately `timeout` seconds. (It may be a bit more if
|
|
373 |
a transport operation takes a long time to complete.)
|
|
374 |
"""
|
|
1957.1.17
by John Arbash Meinel
Change tests that expect locking to fail to timeout sooner. |
375 |
if timeout is None: |
376 |
timeout = _DEFAULT_TIMEOUT_SECONDS |
|
377 |
if poll is None: |
|
378 |
poll = _DEFAULT_POLL_SECONDS |
|
379 |
||
1553.5.12
by Martin Pool
New LockDir locking mechanism |
380 |
# XXX: the transport interface doesn't let us guard
|
381 |
# against operations there taking a long time.
|
|
382 |
deadline = time.time() + timeout |
|
1957.1.13
by John Arbash Meinel
Change to reporting the time when we will stop trying to grab the lock |
383 |
deadline_str = None |
1957.1.7
by John Arbash Meinel
Add the ability to report if the lock changes from underneath you |
384 |
last_info = None |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
385 |
while True: |
386 |
try: |
|
387 |
self.attempt_lock() |
|
388 |
return
|
|
389 |
except LockContention: |
|
390 |
pass
|
|
1957.1.7
by John Arbash Meinel
Add the ability to report if the lock changes from underneath you |
391 |
new_info = self.peek() |
392 |
mutter('last_info: %s, new info: %s', last_info, new_info) |
|
393 |
if new_info is not None and new_info != last_info: |
|
1957.1.9
by John Arbash Meinel
Change default timeouts, and report differently the first failure |
394 |
if last_info is None: |
395 |
start = 'Unable to obtain' |
|
396 |
else: |
|
397 |
start = 'Lock owner changed for' |
|
1957.1.7
by John Arbash Meinel
Add the ability to report if the lock changes from underneath you |
398 |
last_info = new_info |
399 |
formatted_info = self._format_lock_info(new_info) |
|
1957.1.13
by John Arbash Meinel
Change to reporting the time when we will stop trying to grab the lock |
400 |
if deadline_str is None: |
401 |
deadline_str = time.strftime('%H:%M:%S', |
|
402 |
time.localtime(deadline)) |
|
1957.1.9
by John Arbash Meinel
Change default timeouts, and report differently the first failure |
403 |
self._report_function('%s %s\n' |
1957.1.7
by John Arbash Meinel
Add the ability to report if the lock changes from underneath you |
404 |
'%s\n' # held by |
405 |
'%s\n' # locked ... ago |
|
1957.1.13
by John Arbash Meinel
Change to reporting the time when we will stop trying to grab the lock |
406 |
'Will continue to try until %s\n', |
1957.1.9
by John Arbash Meinel
Change default timeouts, and report differently the first failure |
407 |
start, |
1957.1.7
by John Arbash Meinel
Add the ability to report if the lock changes from underneath you |
408 |
formatted_info[0], |
409 |
formatted_info[1], |
|
410 |
formatted_info[2], |
|
1957.1.13
by John Arbash Meinel
Change to reporting the time when we will stop trying to grab the lock |
411 |
deadline_str) |
1957.1.1
by John Arbash Meinel
Report to the user when we are spinning on a lock |
412 |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
413 |
if time.time() + poll < deadline: |
414 |
time.sleep(poll) |
|
415 |
else: |
|
416 |
raise LockContention(self) |
|
417 |
||
1553.5.44
by Martin Pool
LockableFiles can now call LockDir directly |
418 |
def lock_write(self): |
419 |
"""Wait for and acquire the lock."""
|
|
1957.1.2
by John Arbash Meinel
Switch the default from instantly aborting, to waiting as long as 1 minute (down from 5 minutes) |
420 |
self.wait_lock() |
1553.5.44
by Martin Pool
LockableFiles can now call LockDir directly |
421 |
|
422 |
def lock_read(self): |
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
423 |
"""Compatibility-mode shared lock.
|
1553.5.44
by Martin Pool
LockableFiles can now call LockDir directly |
424 |
|
425 |
LockDir doesn't support shared read-only locks, so this
|
|
1553.5.54
by Martin Pool
Add LockDir.read_lock fake method |
426 |
just pretends that the lock is taken but really does nothing.
|
1553.5.44
by Martin Pool
LockableFiles can now call LockDir directly |
427 |
"""
|
428 |
# At the moment Branches are commonly locked for read, but
|
|
429 |
# we can't rely on that remotely. Once this is cleaned up,
|
|
430 |
# reenable this warning to prevent it coming back in
|
|
431 |
# -- mbp 20060303
|
|
432 |
## warn("LockDir.lock_read falls back to write lock")
|
|
1553.5.54
by Martin Pool
Add LockDir.read_lock fake method |
433 |
if self._lock_held or self._fake_read_lock: |
434 |
raise LockContention(self) |
|
435 |
self._fake_read_lock = True |
|
1553.5.44
by Martin Pool
LockableFiles can now call LockDir directly |
436 |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
437 |
def wait(self, timeout=20, poll=0.5): |
1553.5.33
by Martin Pool
LockDir review comment fixes |
438 |
"""Wait a certain period for a lock to be released."""
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
439 |
# XXX: the transport interface doesn't let us guard
|
440 |
# against operations there taking a long time.
|
|
441 |
deadline = time.time() + timeout |
|
442 |
while True: |
|
443 |
if self.peek(): |
|
444 |
return
|
|
445 |
if time.time() + poll < deadline: |
|
446 |
time.sleep(poll) |
|
447 |
else: |
|
448 |
raise LockContention(self) |
|
1553.5.25
by Martin Pool
New LockDir.force_break and simple test case |
449 |
|
1957.1.5
by John Arbash Meinel
Create a helper function for formatting lock information |
450 |
def _format_lock_info(self, info): |
451 |
"""Turn the contents of peek() into something for the user"""
|
|
452 |
lock_url = self.transport.abspath(self.path) |
|
453 |
delta = time.time() - int(info['start_time']) |
|
454 |
return [ |
|
455 |
'lock %s' % (lock_url,), |
|
456 |
'held by %(user)s on host %(hostname)s [process #%(pid)s]' % info, |
|
457 |
'locked %s' % (format_delta(delta),), |
|
458 |
]
|
|
459 |