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

clean up after http p2p proxy GET is interrupted

Browse source 
There was an annex worker thread that did not get stopped.

It was stuck in ReceiveMessage from the P2PHandleTMVar.

Fixed by making P2PHandleTMVar closeable.

In serveGet, releaseP2PConnection has to come first, else the
annexworker may not shut down, if it's waiting to read from it.

In proxyConnection, call closeRemoteSide in order to wait for the ssh
process (for example).
This commit is contained in:
Joey Hess 2024-07-26 15:25:15 -04:00
parent 5ebbb31b36
commit 267a202e72
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 60 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
P2P/Http/Server.hs
View file

@ -194,8 +194,8 @@ serveGet st su apiver (B64Key k) cu bypass baf startat sec auth = do
-- Make sure the annexworker is not left blocked on endv
-- if the client disconnected early.
void $ liftIO $ atomically $ tryPutTMVar endv ()
void $ tryNonAsync $ wait annexworker
void $ tryNonAsync $ releaseP2PConnection conn
void $ tryNonAsync $ wait annexworker
sizer = pure $ Len $ case startat of
Just (Offset o) -> fromIntegral o

43
P2P/Http/State.hs
View file

@ -302,14 +302,14 @@ mkP2PConnectionPair connparams (n1, n2) = do
hdl2 <- newEmptyTMVarIO
wait1 <- newEmptyTMVarIO
wait2 <- newEmptyTMVarIO
let h1 = P2PHandleTMVar hdl1 $
if connectionWaitVar connparams
then Just wait1
else Nothing
let h2 = P2PHandleTMVar hdl2 $
if connectionWaitVar connparams
then Just wait2
else Nothing
closed1 <- newEmptyTMVarIO
closed2 <- newEmptyTMVarIO
let h1 = P2PHandleTMVar hdl1
(if connectionWaitVar connparams then Just wait1 else Nothing)
closed1
let h2 = P2PHandleTMVar hdl2
(if connectionWaitVar connparams then Just wait2 else Nothing)
closed2
let clientconn = P2PConnection Nothing
(const True) h2 h1
(ConnIdent (Just n1))
@ -366,10 +366,15 @@ proxyConnection relv connparams workerpool proxyconn = do
liftIO $ runNetProto proxyfromclientrunst proxyfromclientconn $
P2P.net P2P.receiveMessage
let releaseconn returntopool =
atomically $ void $ tryPutTMVar relv $
liftIO $ wait asyncworker
>>= either throwM return
let releaseconn returntopool =
atomically $ void $ tryPutTMVar relv $ do
r <- liftIO $ wait asyncworker
liftIO $ closeConnection proxyfromclientconn
liftIO $ closeConnection clientconn
inAnnexWorker' workerpool $
Proxy.closeRemoteSide $
proxyConnectionRemoteSide proxyconn
either throwM return r
return $ Right $ P2PConnectionPair
{ clientRunState = clientrunst
@ -380,16 +385,10 @@ proxyConnection relv connparams workerpool proxyconn = do
}
where
protoerrhandler cont a = a >>= \case
-- TODO protocol error, or client hung up, release the p2p
-- connection
Left err -> do
liftIO $ hPutStrLn stderr ("protoerrhandler: " ++ show err)
Proxy.closeRemoteSide $ proxyConnectionRemoteSide proxyconn
return ()
Right v -> do
liftIO $ print "protoerrhandler returned"
Proxy.closeRemoteSide $ proxyConnectionRemoteSide proxyconn
cont v
Left err ->
Proxy.closeRemoteSide $
proxyConnectionRemoteSide proxyconn
Right v -> cont v
proxydone = return ()
requestcomplete () = return ()