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

closeP2PConnection on interrupted GET

Browse source
This commit is contained in:
Joey Hess 2024-07-26 15:50:01 -04:00
parent 267a202e72
commit fb43b7ea3f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
P2P/Http/Server.hs
View file

@ -42,6 +42,7 @@ import Control.Concurrent.STM
import Control.Concurrent.Async import Control.Concurrent.Async
import Control.Concurrent import Control.Concurrent
import System.IO.Unsafe import System.IO.Unsafe
import Data.Either
p2pHttpApp :: P2PHttpServerState -> Application p2pHttpApp :: P2PHttpServerState -> Application
p2pHttpApp = serve p2pHttpAPI . serveP2pHttp p2pHttpApp = serve p2pHttpAPI . serveP2pHttp
@ -187,14 +188,17 @@ serveGet st su apiver (B64Key k) cu bypass baf startat sec auth = do
waitfinal endv finalv conn annexworker = do waitfinal endv finalv conn annexworker = do
-- Wait for everything to be transferred before -- Wait for everything to be transferred before
-- stopping the annexworker. The validityv will usually -- stopping the annexworker. The finalv will usually
-- be written to at the end. If the client disconnects -- be written to at the end. If the client disconnects
-- early that does not happen, so catch STM exception. -- early that does not happen, so catch STM exception.
liftIO $ void $ tryNonAsync $ atomically $ takeTMVar finalv alltransferred <- isRight
<$> tryNonAsync (liftIO $ atomically $ takeTMVar finalv)
-- Make sure the annexworker is not left blocked on endv -- Make sure the annexworker is not left blocked on endv
-- if the client disconnected early. -- if the client disconnected early.
void $ liftIO $ atomically $ tryPutTMVar endv () void $ liftIO $ atomically $ tryPutTMVar endv ()
void $ tryNonAsync $ releaseP2PConnection conn void $ tryNonAsync $ if alltransferred
then releaseP2PConnection conn
else closeP2PConnection conn
void $ tryNonAsync $ wait annexworker void $ tryNonAsync $ wait annexworker
sizer = pure $ Len $ case startat of sizer = pure $ Len $ case startat of