diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-05 17:02:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-05 17:04:21 -0400 |
| commit | 07ee748029c711c7779f4073a3b946190d9a000e (patch) | |
| tree | c5bae7482dbac98960f1a4d04a2d51bff5f7fd31 /debian/changelog | |
| parent | 9206bdbdf5bbc71ff6dd2c00314902dda1e48c14 (diff) | |
assistant: Detect stale git lock files at startup time, and remove them.
Extends the index.lock handling to other git lock files. I surveyed
all lock files used by git, and found more than I expected. All are
handled the same in git; it leaves them open while doing the operation,
possibly writing the new file content to the lock file, and then closes
them when done.
The gc.pid file is excluded because it won't affect the normal operation
of the assistant, and waiting for a gc to finish on startup wouldn't be
good.
All threads except the webapp thread wait on the new startup sanity checker
thread to complete, so they won't try to do things with git that fail
due to stale lock files. The webapp thread mostly avoids doing that kind of
thing itself. A few configurators might fail on lock files, but only if the
user is explicitly trying to run them. The webapp needs to start
immediately when the user has opened it, even if there are stale lock
files.
Arranging for the threads to wait on the startup sanity checker was a bit
of a bear. Have to get all the NotificationHandles set up before the
startup sanity checker runs, or they won't see its signal. Perhaps
the NotificationBroadcaster is not the best interface to have used for
this. Oh well, it works.
This commit was sponsored by Michael Jakl
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 4bbdffb3f..6768077fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,7 @@ git-annex (4.20131003) UNRELEASED; urgency=low * Automatically and safely detect and recover from dangling .git/annex/index.lock files, which would prevent git from committing to the git-annex branch, eg after a crash. - * watcher: Detect at startup time when there is a stale .git/lock, - and remove it so it does not interfere with the automatic - commits of changed files. + * assistant: Detect stale git lock files at startup time, and remove them. * addurl: Better sanitization of generated filenames. * Better sanitization of problem characters when generating URL and WORM keys. |