mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

LiveUpdate db updates working

Browse source 
I've tested the behavior of the thread that waits for the LiveUpdate to
be finished, and it does get signaled and exit cleanly when the
LiveUpdate is GCed instead.

Made finishedLiveUpdate wait for the thread to finish updating the
database.

There is a case where GC doesn't happen in time and the database is left
with a live update recorded in it. This should not be a problem as such
stale data can also happen when interrupted and will need to be detected
when loading the database.

Balanced preferred content expressions now call startLiveUpdate.
This commit is contained in:
Joey Hess 2024-08-24 11:49:58 -04:00
parent 84d1bb746b
commit 2f20b939b7
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 55 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Limit.hs
View file

@ -18,6 +18,7 @@ import Annex.WorkTree
import Annex.UUID
import Annex.Magic
import Annex.RepoSize
import Annex.RepoSize.LiveUpdate
import Logs.MaxSize
import Annex.Link
import Types.Link
@ -598,7 +599,7 @@ limitFullyBalanced :: Maybe UUID -> Annex GroupMap -> MkLimit Annex
limitFullyBalanced = limitFullyBalanced' "fullybalanced"
limitFullyBalanced' :: String -> Maybe UUID -> Annex GroupMap -> MkLimit Annex
limitFullyBalanced' = limitFullyBalanced'' $ \n key candidates -> do
limitFullyBalanced' = limitFullyBalanced'' $ \lu n key candidates -> do
maxsizes <- getMaxSizes
sizemap <- getRepoSizes False
threshhold <- annexFullyBalancedThreshhold <$> Annex.getGitConfig
@ -632,7 +633,7 @@ repoHasSpace keysize inrepo (RepoSize reposize) (MaxSize maxsize)
reposize + keysize <= maxsize
limitFullyBalanced''
:: (Int -> Key -> S.Set UUID -> Annex (S.Set UUID))
:: (LiveUpdate -> Int -> Key -> S.Set UUID -> Annex (S.Set UUID))
-> String
-> Maybe UUID
-> Annex GroupMap
@ -650,7 +651,7 @@ limitFullyBalanced'' filtercandidates termname mu getgroupmap want =
getgroupmap (toGroup s) n want
limitFullyBalanced'''
:: (Int -> Key -> S.Set UUID -> Annex (S.Set UUID))
:: (LiveUpdate -> Int -> Key -> S.Set UUID -> Annex (S.Set UUID))
-> String
-> Maybe UUID
-> Annex GroupMap
@ -662,13 +663,17 @@ limitFullyBalanced''' filtercandidates termname mu getgroupmap g n want = Right
gm <- getgroupmap
let groupmembers = fromMaybe S.empty $
M.lookup g (uuidsByGroup gm)
candidates <- filtercandidates n key groupmembers
return $ if S.null candidates
-- TODO locking for liveupdate
candidates <- filtercandidates lu n key groupmembers
let wanted = if S.null candidates
then False
else case (mu, M.lookup g (balancedPickerByGroup gm)) of
(Just u, Just picker) ->
u `elem` picker candidates key n
_ -> False
when wanted $
startLiveUpdate lu
return wanted
, matchNeedsFileName = False
, matchNeedsFileContent = False
, matchNeedsKey = True
@ -685,7 +690,7 @@ limitFullySizeBalanced :: Maybe UUID -> Annex GroupMap -> MkLimit Annex
limitFullySizeBalanced = limitFullySizeBalanced' "fullysizebalanced"
limitFullySizeBalanced' :: String -> Maybe UUID -> Annex GroupMap -> MkLimit Annex
limitFullySizeBalanced' = limitFullyBalanced'' $ \n key candidates -> do
limitFullySizeBalanced' = limitFullyBalanced'' $ \lu n key candidates -> do
maxsizes <- getMaxSizes
sizemap <- getRepoSizes False
filterCandidatesFullySizeBalanced maxsizes sizemap n key candidates