propagate git-annex -c on to transferrer child process
git -c was already propagated via environment, but need this for consistency. Also, notice it does not use gitAnnexChildProcess to run the transferrer. So nothing is done about avoid it taking the pid lock. It's possible that the caller is already doing something that took the pid lock, and if so, the transferrer will certianly fail, since it needs to take the pid lock too. This may prevent combining annex.stalldetection with annex.pidlock, but I have not verified it's really a problem. If it was, it seems git-annex would have to take the pid lock when starting a transferrer, and hold it until shutdown, or would need to take pid lock when starting to use a transferrer, and hold it until done with a transfer and then drop it. The latter would require starting the transferrer with pid locking disabled for the child process, so assumes that the transferrer does not do anyting that needs locking when not running a transfer.
This commit is contained in:
parent
00526a6739
commit
74c1e0660b
8 changed files with 65 additions and 45 deletions
|
@ -41,14 +41,22 @@ import System.Posix.Process (getProcessGroupIDOf)
|
|||
|
||||
type SignalActionsVar = TVar (M.Map SignalAction (Int -> IO ()))
|
||||
|
||||
data RunTransferrer = RunTransferrer String [CommandParam] BatchCommandMaker
|
||||
|
||||
mkRunTransferrer :: BatchCommandMaker -> Annex RunTransferrer
|
||||
mkRunTransferrer batchmaker = RunTransferrer
|
||||
<$> liftIO programPath
|
||||
<*> gitAnnexChildProcessParams "transferrer" []
|
||||
<*> pure batchmaker
|
||||
|
||||
{- Runs an action with a Transferrer from the pool. -}
|
||||
withTransferrer :: (Transferrer -> Annex a) -> Annex a
|
||||
withTransferrer a = do
|
||||
program <- liftIO programPath
|
||||
rt <- mkRunTransferrer nonBatchCommandMaker
|
||||
pool <- Annex.getState Annex.transferrerpool
|
||||
let nocheck = pure (pure True)
|
||||
signalactonsvar <- Annex.getState Annex.signalactions
|
||||
withTransferrer' False signalactonsvar nocheck program nonBatchCommandMaker pool a
|
||||
withTransferrer' False signalactonsvar nocheck rt pool a
|
||||
|
||||
withTransferrer'
|
||||
:: (MonadIO m, MonadMask m)
|
||||
|
@ -59,19 +67,18 @@ withTransferrer'
|
|||
-- processes are left in the pool for use later.
|
||||
-> SignalActionsVar
|
||||
-> MkCheckTransferrer
|
||||
-> FilePath
|
||||
-> BatchCommandMaker
|
||||
-> RunTransferrer
|
||||
-> TransferrerPool
|
||||
-> (Transferrer -> m a)
|
||||
-> m a
|
||||
withTransferrer' minimizeprocesses signalactonsvar mkcheck program batchmaker pool a = do
|
||||
withTransferrer' minimizeprocesses signalactonsvar mkcheck rt pool a = do
|
||||
(mi, leftinpool) <- liftIO $ atomically (popTransferrerPool pool)
|
||||
(i@(TransferrerPoolItem _ check), t) <- liftIO $ case mi of
|
||||
Nothing -> do
|
||||
t <- mkTransferrer signalactonsvar program batchmaker
|
||||
t <- mkTransferrer signalactonsvar rt
|
||||
i <- mkTransferrerPoolItem mkcheck t
|
||||
return (i, t)
|
||||
Just i -> checkTransferrerPoolItem signalactonsvar program batchmaker i
|
||||
Just i -> checkTransferrerPoolItem signalactonsvar rt i
|
||||
a t `finally` returntopool leftinpool check t i
|
||||
where
|
||||
returntopool leftinpool check t i
|
||||
|
@ -87,8 +94,8 @@ withTransferrer' minimizeprocesses signalactonsvar mkcheck program batchmaker po
|
|||
|
||||
{- Check if a Transferrer from the pool is still ok to be used.
|
||||
- If not, stop it and start a new one. -}
|
||||
checkTransferrerPoolItem :: SignalActionsVar -> FilePath -> BatchCommandMaker -> TransferrerPoolItem -> IO (TransferrerPoolItem, Transferrer)
|
||||
checkTransferrerPoolItem signalactonsvar program batchmaker i = case i of
|
||||
checkTransferrerPoolItem :: SignalActionsVar -> RunTransferrer -> TransferrerPoolItem -> IO (TransferrerPoolItem, Transferrer)
|
||||
checkTransferrerPoolItem signalactonsvar rt i = case i of
|
||||
TransferrerPoolItem (Just t) check -> ifM check
|
||||
( return (i, t)
|
||||
, do
|
||||
|
@ -98,7 +105,7 @@ checkTransferrerPoolItem signalactonsvar program batchmaker i = case i of
|
|||
TransferrerPoolItem Nothing check -> new check
|
||||
where
|
||||
new check = do
|
||||
t <- mkTransferrer signalactonsvar program batchmaker
|
||||
t <- mkTransferrer signalactonsvar rt
|
||||
return (TransferrerPoolItem (Just t) check, t)
|
||||
|
||||
data TransferRequestLevel = AnnexLevel | AssistantLevel
|
||||
|
@ -203,10 +210,10 @@ detectStalls (Just (StallDetection minsz duration)) metervar onstall = go Nothin
|
|||
|
||||
{- Starts a new git-annex transfer process, setting up handles
|
||||
- that will be used to communicate with it. -}
|
||||
mkTransferrer :: SignalActionsVar -> FilePath -> BatchCommandMaker -> IO Transferrer
|
||||
mkTransferrer signalactonsvar program batchmaker = do
|
||||
mkTransferrer :: SignalActionsVar -> RunTransferrer -> IO Transferrer
|
||||
mkTransferrer signalactonsvar (RunTransferrer program params batchmaker) = do
|
||||
{- It runs as a batch job. -}
|
||||
let (program', params') = batchmaker (program, [Param "transferrer"])
|
||||
let (program', params') = batchmaker (program, params)
|
||||
{- It's put into its own group so that the whole group can be
|
||||
- killed to stop a transfer. -}
|
||||
(Just writeh, Just readh, _, ph) <- createProcess
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue