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

sim: fix state loss bug

Browse source
This commit is contained in:
Joey Hess 2024-09-20 18:11:37 -04:00
parent 2daa8a8f21
commit e9d4cef10f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Annex/Sim.hs
View file

@ -606,16 +606,16 @@ overFilesRemote r u remote remotepred localpred checkwant handlewanted st =
where where
go remoteu (f, k) st' = go remoteu (f, k) st' =
let af = AssociatedFile $ Just f let af = AssociatedFile $ Just f
in liftIO $ runSimRepo u st' $ \rst -> in liftIO $ runSimRepo u st' $ \st'' rst ->
case M.lookup remoteu (simRepoState st') of case M.lookup remoteu (simRepoState st'') of
Nothing -> return (st', False) Nothing -> return (st'', False)
Just rmtst Just rmtst
| not (checkremotepred remoteu rst k) -> return (st', False) | not (checkremotepred remoteu rst k) -> return (st'', False)
| not (checkremotepred remoteu rmtst k) -> return (st', False) | not (checkremotepred remoteu rmtst k) -> return (st'', False)
| not (checklocalpred rst k) -> return (st', False) | not (checklocalpred rst k) -> return (st'', False)
| otherwise -> ifM (checkwant (Just k) af remoteu) | otherwise -> ifM (checkwant (Just k) af remoteu)
( return (handlewanted remoteu f k r st', True) ( return (handlewanted remoteu f k r st'', True)
, return (st', False) , return (st'', False)
) )
checkremotepred remoteu rst k = checkremotepred remoteu rst k =
remotepred remoteu (getSimLocations rst k) remotepred remoteu (getSimLocations rst k)
@ -655,14 +655,14 @@ simulateDropUnwanted
simulateDropUnwanted st u dropfromname dropfrom = simulateDropUnwanted st u dropfromname dropfrom =
Right $ Left (st, map go $ M.toList $ simFiles st) Right $ Left (st, map go $ M.toList $ simFiles st)
where where
go (f, k) st' = liftIO $ runSimRepo u st' $ \rst -> go (f, k) st' = liftIO $ runSimRepo u st' $ \st'' rst ->
let af = AssociatedFile $ Just f let af = AssociatedFile $ Just f
in if present dropfrom rst k in if present dropfrom rst k
then ifM (wantDrop NoLiveUpdate False (Just dropfrom) (Just k) af Nothing) then ifM (wantDrop NoLiveUpdate False (Just dropfrom) (Just k) af Nothing)
( return $ checkdrop rst k f st' ( return $ checkdrop rst k f st''
, return (st', False) , return (st'', False)
) )
else return (st', False) else return (st'', False)
present ru rst k = ru `S.member` getSimLocations rst k present ru rst k = ru `S.member` getSimLocations rst k
@ -949,14 +949,14 @@ simulatedRepositoryDescription simreponame =
simulationDifferences :: Differences simulationDifferences :: Differences
simulationDifferences = mkDifferences $ S.singleton Simulation simulationDifferences = mkDifferences $ S.singleton Simulation
runSimRepo :: UUID -> SimState SimRepo -> (SimRepoState SimRepo -> Annex (SimState SimRepo, t)) -> IO (SimState SimRepo, t) runSimRepo :: UUID -> SimState SimRepo -> (SimState SimRepo -> SimRepoState SimRepo -> Annex (SimState SimRepo, t)) -> IO (SimState SimRepo, t)
runSimRepo u st a = do runSimRepo u st a = do
st' <- updateSimRepos st st' <- updateSimRepos st
case M.lookup u (simRepoState st') of case M.lookup u (simRepoState st') of
Just rst -> case simRepo rst of Just rst -> case simRepo rst of
Just sr -> do Just sr -> do
((st'', t), strd) <- Annex.run (simRepoAnnex sr) $ ((st'', t), strd) <- Annex.run (simRepoAnnex sr) $
doQuietAction (a rst) doQuietAction (a st' rst)
let sr' = sr let sr' = sr
{ simRepoAnnex = strd { simRepoAnnex = strd
} }