2012-06-13 16:36:33 +00:00
|
|
|
{- git-annex assistant tree watcher
|
|
|
|
-
|
|
|
|
- Copyright 2012 Joey Hess <joey@kitenet.net>
|
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
2012-07-20 23:29:59 +00:00
|
|
|
module Assistant.Threads.Watcher (
|
|
|
|
watchThread,
|
|
|
|
checkCanWatch,
|
|
|
|
needLsof,
|
|
|
|
stageSymlink,
|
|
|
|
onAddSymlink,
|
|
|
|
runHandler,
|
|
|
|
) where
|
|
|
|
|
|
|
|
import Assistant.Common
|
2012-06-13 16:36:33 +00:00
|
|
|
import Assistant.ThreadedMonad
|
|
|
|
import Assistant.DaemonStatus
|
2012-06-19 06:40:21 +00:00
|
|
|
import Assistant.Changes
|
2012-07-05 16:58:49 +00:00
|
|
|
import Assistant.TransferQueue
|
2012-07-29 15:31:06 +00:00
|
|
|
import Assistant.Alert
|
2012-07-05 16:58:49 +00:00
|
|
|
import Logs.Transfer
|
2012-06-19 03:47:48 +00:00
|
|
|
import Utility.DirWatcher
|
|
|
|
import Utility.Types.DirWatcher
|
2012-06-20 23:04:16 +00:00
|
|
|
import qualified Annex
|
2012-06-13 16:36:33 +00:00
|
|
|
import qualified Annex.Queue
|
|
|
|
import qualified Git.Command
|
|
|
|
import qualified Git.UpdateIndex
|
|
|
|
import qualified Git.HashObject
|
|
|
|
import qualified Backend
|
|
|
|
import Annex.Content
|
|
|
|
import Annex.CatFile
|
|
|
|
import Git.Types
|
|
|
|
|
|
|
|
import Data.Bits.Utils
|
|
|
|
import qualified Data.ByteString.Lazy as L
|
|
|
|
|
2012-07-20 23:29:59 +00:00
|
|
|
thisThread :: ThreadName
|
|
|
|
thisThread = "Watcher"
|
|
|
|
|
2012-06-17 18:02:58 +00:00
|
|
|
checkCanWatch :: Annex ()
|
2012-06-19 03:47:48 +00:00
|
|
|
checkCanWatch
|
|
|
|
| canWatch =
|
2012-09-13 04:57:52 +00:00
|
|
|
unlessM (liftIO (inPath "lsof") <||> Annex.getState Annex.force)
|
2012-06-19 03:47:48 +00:00
|
|
|
needLsof
|
|
|
|
| otherwise = error "watch mode is not available on this system"
|
2012-06-17 18:02:58 +00:00
|
|
|
|
|
|
|
needLsof :: Annex ()
|
|
|
|
needLsof = error $ unlines
|
|
|
|
[ "The lsof command is needed for watch mode to be safe, and is not in PATH."
|
|
|
|
, "To override lsof checks to ensure that files are not open for writing"
|
|
|
|
, "when added to the annex, you can use --force"
|
|
|
|
, "Be warned: This can corrupt data in the annex, and make fsck complain."
|
|
|
|
]
|
|
|
|
|
2012-09-06 18:56:04 +00:00
|
|
|
watchThread :: ThreadState -> DaemonStatusHandle -> TransferQueue -> ChangeChan -> NamedThread
|
|
|
|
watchThread st dstatus transferqueue changechan = NamedThread thisThread $ do
|
always check with ls-files before adding new files
Makes it safe to use git annex unlock with the watcher/assistant.
And also to mix use of the watcher/assistant with regular files stored in git.
Long ago, I had avoided doing this check, except during the startup scan,
because it would be slow to run ls-files repeatedly.
But then I added the lsof check, and to make that fast, got it to detect
batch file adds. So let's move the ls-files check to also occur when it'll
have a batch, and can check them all with one call.
This does slow down adding a single file by just a bit, but really only
a little bit. (The lsof check is probably more expensive.) It also
speeds up the startup scan, especially when there are lots of new files
found by the scan.
Also, fixed the sleep for annex.delayadd to not run while the threadstate
lock is held, so it doesn't unnecessarily freeze everything else.
Also, --force no longer makes it skip the lsof check, which was not
documented, and seems never a good idea.
2012-10-02 21:34:22 +00:00
|
|
|
void $ watchDir "." ignored hooks startup
|
2012-07-20 23:29:59 +00:00
|
|
|
debug thisThread [ "watching", "."]
|
2012-06-13 16:36:33 +00:00
|
|
|
where
|
2012-07-29 15:31:06 +00:00
|
|
|
startup = startupScan st dstatus
|
always check with ls-files before adding new files
Makes it safe to use git annex unlock with the watcher/assistant.
And also to mix use of the watcher/assistant with regular files stored in git.
Long ago, I had avoided doing this check, except during the startup scan,
because it would be slow to run ls-files repeatedly.
But then I added the lsof check, and to make that fast, got it to detect
batch file adds. So let's move the ls-files check to also occur when it'll
have a batch, and can check them all with one call.
This does slow down adding a single file by just a bit, but really only
a little bit. (The lsof check is probably more expensive.) It also
speeds up the startup scan, especially when there are lots of new files
found by the scan.
Also, fixed the sleep for annex.delayadd to not run while the threadstate
lock is held, so it doesn't unnecessarily freeze everything else.
Also, --force no longer makes it skip the lsof check, which was not
documented, and seems never a good idea.
2012-10-02 21:34:22 +00:00
|
|
|
hook a = Just $ runHandler thisThread st dstatus transferqueue changechan a
|
|
|
|
hooks = mkWatchHooks
|
|
|
|
{ addHook = hook onAdd
|
|
|
|
, delHook = hook onDel
|
|
|
|
, addSymlinkHook = hook onAddSymlink
|
|
|
|
, delDirHook = hook onDelDir
|
|
|
|
, errHook = hook onErr
|
2012-06-13 16:36:33 +00:00
|
|
|
}
|
|
|
|
|
2012-06-19 02:13:39 +00:00
|
|
|
{- Initial scartup scan. The action should return once the scan is complete. -}
|
2012-07-30 20:32:32 +00:00
|
|
|
startupScan :: ThreadState -> DaemonStatusHandle -> IO a -> IO a
|
2012-07-29 15:31:06 +00:00
|
|
|
startupScan st dstatus scanner = do
|
2012-07-29 17:22:08 +00:00
|
|
|
runThreadState st $ showAction "scanning"
|
2012-09-13 04:57:52 +00:00
|
|
|
alertWhile' dstatus startupScanAlert $ do
|
2012-07-30 20:32:32 +00:00
|
|
|
r <- scanner
|
2012-06-19 02:13:39 +00:00
|
|
|
|
2012-07-29 23:05:51 +00:00
|
|
|
-- Notice any files that were deleted before
|
|
|
|
-- watching was started.
|
|
|
|
runThreadState st $ do
|
|
|
|
inRepo $ Git.Command.run "add" [Param "--update"]
|
|
|
|
showAction "started"
|
2012-07-30 06:07:02 +00:00
|
|
|
|
|
|
|
modifyDaemonStatus_ dstatus $ \s -> s { scanComplete = True }
|
2012-07-30 20:32:32 +00:00
|
|
|
|
|
|
|
return (True, r)
|
2012-06-19 02:13:39 +00:00
|
|
|
|
2012-06-13 16:36:33 +00:00
|
|
|
ignored :: FilePath -> Bool
|
2012-06-18 17:01:58 +00:00
|
|
|
ignored = ig . takeFileName
|
|
|
|
where
|
|
|
|
ig ".git" = True
|
|
|
|
ig ".gitignore" = True
|
|
|
|
ig ".gitattributes" = True
|
|
|
|
ig _ = False
|
|
|
|
|
always check with ls-files before adding new files
Makes it safe to use git annex unlock with the watcher/assistant.
And also to mix use of the watcher/assistant with regular files stored in git.
Long ago, I had avoided doing this check, except during the startup scan,
because it would be slow to run ls-files repeatedly.
But then I added the lsof check, and to make that fast, got it to detect
batch file adds. So let's move the ls-files check to also occur when it'll
have a batch, and can check them all with one call.
This does slow down adding a single file by just a bit, but really only
a little bit. (The lsof check is probably more expensive.) It also
speeds up the startup scan, especially when there are lots of new files
found by the scan.
Also, fixed the sleep for annex.delayadd to not run while the threadstate
lock is held, so it doesn't unnecessarily freeze everything else.
Also, --force no longer makes it skip the lsof check, which was not
documented, and seems never a good idea.
2012-10-02 21:34:22 +00:00
|
|
|
type Handler = ThreadName -> FilePath -> Maybe FileStatus -> DaemonStatusHandle -> TransferQueue -> Annex (Maybe Change)
|
2012-06-13 16:36:33 +00:00
|
|
|
|
|
|
|
{- Runs an action handler, inside the Annex monad, and if there was a
|
|
|
|
- change, adds it to the ChangeChan.
|
|
|
|
-
|
|
|
|
- Exceptions are ignored, otherwise a whole watcher thread could be crashed.
|
|
|
|
-}
|
always check with ls-files before adding new files
Makes it safe to use git annex unlock with the watcher/assistant.
And also to mix use of the watcher/assistant with regular files stored in git.
Long ago, I had avoided doing this check, except during the startup scan,
because it would be slow to run ls-files repeatedly.
But then I added the lsof check, and to make that fast, got it to detect
batch file adds. So let's move the ls-files check to also occur when it'll
have a batch, and can check them all with one call.
This does slow down adding a single file by just a bit, but really only
a little bit. (The lsof check is probably more expensive.) It also
speeds up the startup scan, especially when there are lots of new files
found by the scan.
Also, fixed the sleep for annex.delayadd to not run while the threadstate
lock is held, so it doesn't unnecessarily freeze everything else.
Also, --force no longer makes it skip the lsof check, which was not
documented, and seems never a good idea.
2012-10-02 21:34:22 +00:00
|
|
|
runHandler :: ThreadName -> ThreadState -> DaemonStatusHandle -> TransferQueue -> ChangeChan -> Handler -> FilePath -> Maybe FileStatus -> IO ()
|
|
|
|
runHandler threadname st dstatus transferqueue changechan handler file filestatus = void $ do
|
2012-06-13 16:36:33 +00:00
|
|
|
r <- tryIO go
|
|
|
|
case r of
|
|
|
|
Left e -> print e
|
|
|
|
Right Nothing -> noop
|
2012-06-22 17:39:44 +00:00
|
|
|
Right (Just change) -> recordChange changechan change
|
2012-06-13 16:36:33 +00:00
|
|
|
where
|
always check with ls-files before adding new files
Makes it safe to use git annex unlock with the watcher/assistant.
And also to mix use of the watcher/assistant with regular files stored in git.
Long ago, I had avoided doing this check, except during the startup scan,
because it would be slow to run ls-files repeatedly.
But then I added the lsof check, and to make that fast, got it to detect
batch file adds. So let's move the ls-files check to also occur when it'll
have a batch, and can check them all with one call.
This does slow down adding a single file by just a bit, but really only
a little bit. (The lsof check is probably more expensive.) It also
speeds up the startup scan, especially when there are lots of new files
found by the scan.
Also, fixed the sleep for annex.delayadd to not run while the threadstate
lock is held, so it doesn't unnecessarily freeze everything else.
Also, --force no longer makes it skip the lsof check, which was not
documented, and seems never a good idea.
2012-10-02 21:34:22 +00:00
|
|
|
go = runThreadState st $ handler threadname file filestatus dstatus transferqueue
|
2012-06-13 16:36:33 +00:00
|
|
|
|
|
|
|
onAdd :: Handler
|
always check with ls-files before adding new files
Makes it safe to use git annex unlock with the watcher/assistant.
And also to mix use of the watcher/assistant with regular files stored in git.
Long ago, I had avoided doing this check, except during the startup scan,
because it would be slow to run ls-files repeatedly.
But then I added the lsof check, and to make that fast, got it to detect
batch file adds. So let's move the ls-files check to also occur when it'll
have a batch, and can check them all with one call.
This does slow down adding a single file by just a bit, but really only
a little bit. (The lsof check is probably more expensive.) It also
speeds up the startup scan, especially when there are lots of new files
found by the scan.
Also, fixed the sleep for annex.delayadd to not run while the threadstate
lock is held, so it doesn't unnecessarily freeze everything else.
Also, --force no longer makes it skip the lsof check, which was not
documented, and seems never a good idea.
2012-10-02 21:34:22 +00:00
|
|
|
onAdd _ file filestatus _ _
|
|
|
|
| maybe False isRegularFile filestatus = pendingAddChange file
|
2012-06-20 23:04:16 +00:00
|
|
|
| otherwise = noChange
|
2012-06-13 16:36:33 +00:00
|
|
|
where
|
|
|
|
|
|
|
|
{- A symlink might be an arbitrary symlink, which is just added.
|
|
|
|
- Or, if it is a git-annex symlink, ensure it points to the content
|
|
|
|
- before adding it.
|
|
|
|
-}
|
|
|
|
onAddSymlink :: Handler
|
always check with ls-files before adding new files
Makes it safe to use git annex unlock with the watcher/assistant.
And also to mix use of the watcher/assistant with regular files stored in git.
Long ago, I had avoided doing this check, except during the startup scan,
because it would be slow to run ls-files repeatedly.
But then I added the lsof check, and to make that fast, got it to detect
batch file adds. So let's move the ls-files check to also occur when it'll
have a batch, and can check them all with one call.
This does slow down adding a single file by just a bit, but really only
a little bit. (The lsof check is probably more expensive.) It also
speeds up the startup scan, especially when there are lots of new files
found by the scan.
Also, fixed the sleep for annex.delayadd to not run while the threadstate
lock is held, so it doesn't unnecessarily freeze everything else.
Also, --force no longer makes it skip the lsof check, which was not
documented, and seems never a good idea.
2012-10-02 21:34:22 +00:00
|
|
|
onAddSymlink threadname file filestatus dstatus transferqueue = go =<< Backend.lookupFile file
|
2012-06-13 16:36:33 +00:00
|
|
|
where
|
|
|
|
go (Just (key, _)) = do
|
|
|
|
link <- calcGitLink file key
|
|
|
|
ifM ((==) link <$> liftIO (readSymbolicLink file))
|
2012-07-05 16:58:49 +00:00
|
|
|
( do
|
2012-07-28 22:02:11 +00:00
|
|
|
s <- liftIO $ getDaemonStatus dstatus
|
2012-07-05 16:58:49 +00:00
|
|
|
checkcontent key s
|
|
|
|
ensurestaged link s
|
2012-06-13 16:36:33 +00:00
|
|
|
, do
|
2012-07-20 23:29:59 +00:00
|
|
|
liftIO $ debug threadname ["fix symlink", file]
|
2012-06-13 16:36:33 +00:00
|
|
|
liftIO $ removeFile file
|
|
|
|
liftIO $ createSymbolicLink link file
|
|
|
|
addlink link
|
|
|
|
)
|
|
|
|
go Nothing = do -- other symlink
|
|
|
|
link <- liftIO (readSymbolicLink file)
|
2012-07-28 22:02:11 +00:00
|
|
|
ensurestaged link =<< liftIO (getDaemonStatus dstatus)
|
2012-06-13 16:36:33 +00:00
|
|
|
|
|
|
|
{- This is often called on symlinks that are already
|
|
|
|
- staged correctly. A symlink may have been deleted
|
|
|
|
- and being re-added, or added when the watcher was
|
|
|
|
- not running. So they're normally restaged to make sure.
|
|
|
|
-
|
|
|
|
- As an optimisation, during the status scan, avoid
|
|
|
|
- restaging everything. Only links that were created since
|
|
|
|
- the last time the daemon was running are staged.
|
|
|
|
- (If the daemon has never ran before, avoid staging
|
|
|
|
- links too.)
|
|
|
|
-}
|
|
|
|
ensurestaged link daemonstatus
|
|
|
|
| scanComplete daemonstatus = addlink link
|
|
|
|
| otherwise = case filestatus of
|
|
|
|
Just s
|
2012-06-13 17:35:15 +00:00
|
|
|
| not (afterLastDaemonRun (statusChangeTime s) daemonstatus) -> noChange
|
2012-06-13 16:36:33 +00:00
|
|
|
_ -> addlink link
|
|
|
|
|
|
|
|
{- For speed, tries to reuse the existing blob for
|
|
|
|
- the symlink target. -}
|
|
|
|
addlink link = do
|
2012-07-20 23:29:59 +00:00
|
|
|
liftIO $ debug threadname ["add symlink", file]
|
2012-06-13 16:36:33 +00:00
|
|
|
v <- catObjectDetails $ Ref $ ':':file
|
|
|
|
case v of
|
|
|
|
Just (currlink, sha)
|
|
|
|
| s2w8 link == L.unpack currlink ->
|
|
|
|
stageSymlink file sha
|
|
|
|
_ -> do
|
|
|
|
sha <- inRepo $
|
|
|
|
Git.HashObject.hashObject BlobObject link
|
|
|
|
stageSymlink file sha
|
preliminary deferring of file adds to commit time
Defer adding files to the annex until commit time, when during a batch
operation, a bundle of files will be available. This will allow for
checking a them all with a single lsof call.
The tricky part is that adding the file causes a symlink change inotify.
So I made it wait for an appropriate number of symlink changes to be
received before continuing with the commit. This avoids any delay
in the commit process. It is possible that some unrelated symlink change is
made; if that happens it'll commit it and delay committing the newly added
symlink for 1 second. This seems ok. I do rely on the expected symlink
change event always being received, but only when the add succeeds.
Another way to do it might be to directly stage the symlink, and then
ignore the redundant symlink change event. That would involve some
redundant work, and perhaps an empty commit, but if this code turns
out to have some bug, that'd be the best way to avoid it.
FWIW, this change seems to, as a bonus, have produced better grouping
of batch changes into single commits. Before, a large batch change would
result in a series of commits, with the first containing only one file,
and each of the rest bundling a number of files. Now, the added wait for
the symlink changes to arrive gives time for additional add changes to
be processed, all within the same commit.
2012-06-15 20:27:44 +00:00
|
|
|
madeChange file LinkChange
|
2012-06-13 16:36:33 +00:00
|
|
|
|
2012-07-05 16:58:49 +00:00
|
|
|
{- When a new link appears, after the startup scan,
|
|
|
|
- try to get the key's content. -}
|
|
|
|
checkcontent key daemonstatus
|
|
|
|
| scanComplete daemonstatus = unlessM (inAnnex key) $
|
2012-07-25 17:12:34 +00:00
|
|
|
queueTransfers Next transferqueue dstatus
|
2012-07-05 16:58:49 +00:00
|
|
|
key (Just file) Download
|
|
|
|
| otherwise = noop
|
|
|
|
|
2012-06-13 16:36:33 +00:00
|
|
|
onDel :: Handler
|
always check with ls-files before adding new files
Makes it safe to use git annex unlock with the watcher/assistant.
And also to mix use of the watcher/assistant with regular files stored in git.
Long ago, I had avoided doing this check, except during the startup scan,
because it would be slow to run ls-files repeatedly.
But then I added the lsof check, and to make that fast, got it to detect
batch file adds. So let's move the ls-files check to also occur when it'll
have a batch, and can check them all with one call.
This does slow down adding a single file by just a bit, but really only
a little bit. (The lsof check is probably more expensive.) It also
speeds up the startup scan, especially when there are lots of new files
found by the scan.
Also, fixed the sleep for annex.delayadd to not run while the threadstate
lock is held, so it doesn't unnecessarily freeze everything else.
Also, --force no longer makes it skip the lsof check, which was not
documented, and seems never a good idea.
2012-10-02 21:34:22 +00:00
|
|
|
onDel threadname file _ _dstatus _ = do
|
2012-07-20 23:29:59 +00:00
|
|
|
liftIO $ debug threadname ["file deleted", file]
|
2012-06-13 16:36:33 +00:00
|
|
|
Annex.Queue.addUpdateIndex =<<
|
|
|
|
inRepo (Git.UpdateIndex.unstageFile file)
|
preliminary deferring of file adds to commit time
Defer adding files to the annex until commit time, when during a batch
operation, a bundle of files will be available. This will allow for
checking a them all with a single lsof call.
The tricky part is that adding the file causes a symlink change inotify.
So I made it wait for an appropriate number of symlink changes to be
received before continuing with the commit. This avoids any delay
in the commit process. It is possible that some unrelated symlink change is
made; if that happens it'll commit it and delay committing the newly added
symlink for 1 second. This seems ok. I do rely on the expected symlink
change event always being received, but only when the add succeeds.
Another way to do it might be to directly stage the symlink, and then
ignore the redundant symlink change event. That would involve some
redundant work, and perhaps an empty commit, but if this code turns
out to have some bug, that'd be the best way to avoid it.
FWIW, this change seems to, as a bonus, have produced better grouping
of batch changes into single commits. Before, a large batch change would
result in a series of commits, with the first containing only one file,
and each of the rest bundling a number of files. Now, the added wait for
the symlink changes to arrive gives time for additional add changes to
be processed, all within the same commit.
2012-06-15 20:27:44 +00:00
|
|
|
madeChange file RmChange
|
2012-06-13 16:36:33 +00:00
|
|
|
|
|
|
|
{- A directory has been deleted, or moved, so tell git to remove anything
|
|
|
|
- that was inside it from its cache. Since it could reappear at any time,
|
|
|
|
- use --cached to only delete it from the index.
|
|
|
|
-
|
|
|
|
- Note: This could use unstageFile, but would need to run another git
|
|
|
|
- command to get the recursive list of files in the directory, so rm is
|
|
|
|
- just as good. -}
|
|
|
|
onDelDir :: Handler
|
always check with ls-files before adding new files
Makes it safe to use git annex unlock with the watcher/assistant.
And also to mix use of the watcher/assistant with regular files stored in git.
Long ago, I had avoided doing this check, except during the startup scan,
because it would be slow to run ls-files repeatedly.
But then I added the lsof check, and to make that fast, got it to detect
batch file adds. So let's move the ls-files check to also occur when it'll
have a batch, and can check them all with one call.
This does slow down adding a single file by just a bit, but really only
a little bit. (The lsof check is probably more expensive.) It also
speeds up the startup scan, especially when there are lots of new files
found by the scan.
Also, fixed the sleep for annex.delayadd to not run while the threadstate
lock is held, so it doesn't unnecessarily freeze everything else.
Also, --force no longer makes it skip the lsof check, which was not
documented, and seems never a good idea.
2012-10-02 21:34:22 +00:00
|
|
|
onDelDir threadname dir _ _dstatus _ = do
|
2012-07-20 23:29:59 +00:00
|
|
|
liftIO $ debug threadname ["directory deleted", dir]
|
2012-06-13 16:36:33 +00:00
|
|
|
Annex.Queue.addCommand "rm"
|
|
|
|
[Params "--quiet -r --cached --ignore-unmatch --"] [dir]
|
preliminary deferring of file adds to commit time
Defer adding files to the annex until commit time, when during a batch
operation, a bundle of files will be available. This will allow for
checking a them all with a single lsof call.
The tricky part is that adding the file causes a symlink change inotify.
So I made it wait for an appropriate number of symlink changes to be
received before continuing with the commit. This avoids any delay
in the commit process. It is possible that some unrelated symlink change is
made; if that happens it'll commit it and delay committing the newly added
symlink for 1 second. This seems ok. I do rely on the expected symlink
change event always being received, but only when the add succeeds.
Another way to do it might be to directly stage the symlink, and then
ignore the redundant symlink change event. That would involve some
redundant work, and perhaps an empty commit, but if this code turns
out to have some bug, that'd be the best way to avoid it.
FWIW, this change seems to, as a bonus, have produced better grouping
of batch changes into single commits. Before, a large batch change would
result in a series of commits, with the first containing only one file,
and each of the rest bundling a number of files. Now, the added wait for
the symlink changes to arrive gives time for additional add changes to
be processed, all within the same commit.
2012-06-15 20:27:44 +00:00
|
|
|
madeChange dir RmDirChange
|
2012-06-13 16:36:33 +00:00
|
|
|
|
2012-09-06 17:56:23 +00:00
|
|
|
{- Called when there's an error with inotify or kqueue. -}
|
2012-06-13 16:36:33 +00:00
|
|
|
onErr :: Handler
|
always check with ls-files before adding new files
Makes it safe to use git annex unlock with the watcher/assistant.
And also to mix use of the watcher/assistant with regular files stored in git.
Long ago, I had avoided doing this check, except during the startup scan,
because it would be slow to run ls-files repeatedly.
But then I added the lsof check, and to make that fast, got it to detect
batch file adds. So let's move the ls-files check to also occur when it'll
have a batch, and can check them all with one call.
This does slow down adding a single file by just a bit, but really only
a little bit. (The lsof check is probably more expensive.) It also
speeds up the startup scan, especially when there are lots of new files
found by the scan.
Also, fixed the sleep for annex.delayadd to not run while the threadstate
lock is held, so it doesn't unnecessarily freeze everything else.
Also, --force no longer makes it skip the lsof check, which was not
documented, and seems never a good idea.
2012-10-02 21:34:22 +00:00
|
|
|
onErr _ msg _ dstatus _ = do
|
2012-06-13 16:36:33 +00:00
|
|
|
warning msg
|
2012-09-06 17:56:23 +00:00
|
|
|
void $ liftIO $ addAlert dstatus $ warningAlert "watcher" msg
|
2012-06-13 16:36:33 +00:00
|
|
|
return Nothing
|
|
|
|
|
|
|
|
{- Adds a symlink to the index, without ever accessing the actual symlink
|
preliminary deferring of file adds to commit time
Defer adding files to the annex until commit time, when during a batch
operation, a bundle of files will be available. This will allow for
checking a them all with a single lsof call.
The tricky part is that adding the file causes a symlink change inotify.
So I made it wait for an appropriate number of symlink changes to be
received before continuing with the commit. This avoids any delay
in the commit process. It is possible that some unrelated symlink change is
made; if that happens it'll commit it and delay committing the newly added
symlink for 1 second. This seems ok. I do rely on the expected symlink
change event always being received, but only when the add succeeds.
Another way to do it might be to directly stage the symlink, and then
ignore the redundant symlink change event. That would involve some
redundant work, and perhaps an empty commit, but if this code turns
out to have some bug, that'd be the best way to avoid it.
FWIW, this change seems to, as a bonus, have produced better grouping
of batch changes into single commits. Before, a large batch change would
result in a series of commits, with the first containing only one file,
and each of the rest bundling a number of files. Now, the added wait for
the symlink changes to arrive gives time for additional add changes to
be processed, all within the same commit.
2012-06-15 20:27:44 +00:00
|
|
|
- on disk. This avoids a race if git add is used, where the symlink is
|
|
|
|
- changed to something else immediately after creation.
|
|
|
|
-}
|
2012-06-13 16:36:33 +00:00
|
|
|
stageSymlink :: FilePath -> Sha -> Annex ()
|
|
|
|
stageSymlink file sha =
|
|
|
|
Annex.Queue.addUpdateIndex =<<
|
|
|
|
inRepo (Git.UpdateIndex.stageSymlink file sha)
|