From b2d266267f70deaca48fd7cb6679543f9eb8f107 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 14 Oct 2012 14:34:05 -0400 Subject: [PATCH] avoid queuing transfers for remotes after syncing to them is paused This avoids the expensive transfer scan relying on its list of remotes to scan being accurate throughout, which it will not be when the user pauses syncing to a remote. I feel it's ok to queue transfers to *any* known remote, not just the ones being scanned. Note that there are still small races where after syncing to a remote is paused, a transfer can be queued for it. Not just in the expensive transfer scan, but in the cheap failed transfer scan, and elsewhere. --- Assistant/Threads/TransferScanner.hs | 8 ++++++-- doc/design/assistant/webapp.mdwn | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Assistant/Threads/TransferScanner.hs b/Assistant/Threads/TransferScanner.hs index 56ba63ff16..8f44f24d10 100644 --- a/Assistant/Threads/TransferScanner.hs +++ b/Assistant/Threads/TransferScanner.hs @@ -87,7 +87,7 @@ failedTransferScan st dstatus transferqueue r = do transferqueue dstatus (associatedFile info) t r {- This is a expensive scan through the full git work tree, finding - - files to download from or upload to any of the remotes. + - files to download from or upload to any known remote. - - The scan is blocked when the transfer queue gets too large. -} expensiveScan :: ThreadState -> DaemonStatusHandle -> TransferQueue -> [Remote] -> IO () @@ -114,7 +114,11 @@ expensiveScan st dstatus transferqueue rs = unless onlyweb $ do queueTransferWhenSmall transferqueue dstatus (Just f) t r findtransfers f (key, _) = do locs <- loggedLocations key - let use a = return $ catMaybes $ map (a key locs) rs + {- Queue transfers from any known remote. The known + - remotes may have changed since this scan began. -} + let use a = do + knownrs <- liftIO $ knownRemotes <$> getDaemonStatus dstatus + return $ catMaybes $ map (a key locs) knownrs ifM (inAnnex key) ( filterM (wantSend (Just f) . Remote.uuid . fst) =<< use (check Upload False) diff --git a/doc/design/assistant/webapp.mdwn b/doc/design/assistant/webapp.mdwn index f3d959a33b..106e7b1f62 100644 --- a/doc/design/assistant/webapp.mdwn +++ b/doc/design/assistant/webapp.mdwn @@ -8,8 +8,6 @@ The webapp is a web server that displays a shiny interface. This is quite likely because of how the div containing transfers is refereshed. If instead javascript was used to update the progress bar etc for transfers with json data, the buttons would work better. -* Disabling syncing to a remote doesn't stop any running transfer scan, - which can still queue uploads or downloads to the remote. * Transfers from a remote with syncing disabled show as from "unknown". (Note that it's probably not practical to prevent a remote with syncing disabled from initiating transfers, so this can happen.)