mirror of
https://github.com/commercialhaskell/stackage-server.git
synced 2026-01-28 11:50:24 +01:00
Introduce HoogleLocker #206
This is intended to ensure only one thread is creating a Hoogle file at a time.
This commit is contained in:
parent
81df4e9b35
commit
d2f2e1537f
@ -33,7 +33,7 @@ import Yesod.Default.Config2
|
|||||||
import Yesod.Default.Handlers
|
import Yesod.Default.Handlers
|
||||||
import Yesod.GitRepo
|
import Yesod.GitRepo
|
||||||
import System.Process (rawSystem)
|
import System.Process (rawSystem)
|
||||||
import Stackage.Database.Cron (loadFromS3)
|
import Stackage.Database.Cron (loadFromS3, newHoogleLocker)
|
||||||
import Control.AutoUpdate
|
import Control.AutoUpdate
|
||||||
|
|
||||||
-- Import all relevant handler modules here.
|
-- Import all relevant handler modules here.
|
||||||
@ -136,6 +136,7 @@ makeFoundation appSettings = do
|
|||||||
appHoogleLock <- newMVar ()
|
appHoogleLock <- newMVar ()
|
||||||
|
|
||||||
appMirrorStatus <- mkUpdateMirrorStatus
|
appMirrorStatus <- mkUpdateMirrorStatus
|
||||||
|
appHoogleLocker <- newHoogleLocker
|
||||||
|
|
||||||
return App {..}
|
return App {..}
|
||||||
|
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import Yesod.Core.Types (Logger)
|
|||||||
import Yesod.AtomFeed
|
import Yesod.AtomFeed
|
||||||
import Yesod.GitRepo
|
import Yesod.GitRepo
|
||||||
import Stackage.Database
|
import Stackage.Database
|
||||||
|
import Stackage.Database.Cron (HoogleLocker)
|
||||||
import qualified Yesod.Core.Unsafe as Unsafe
|
import qualified Yesod.Core.Unsafe as Unsafe
|
||||||
|
|
||||||
-- | The site argument for your application. This can be a good place to
|
-- | The site argument for your application. This can be a good place to
|
||||||
@ -30,6 +31,7 @@ data App = App
|
|||||||
-- ^ Avoid concurrent Hoogle queries, see
|
-- ^ Avoid concurrent Hoogle queries, see
|
||||||
-- https://github.com/fpco/stackage-server/issues/172
|
-- https://github.com/fpco/stackage-server/issues/172
|
||||||
, appMirrorStatus :: IO (Status, WidgetT App IO ())
|
, appMirrorStatus :: IO (Status, WidgetT App IO ())
|
||||||
|
, appHoogleLocker :: HoogleLocker
|
||||||
}
|
}
|
||||||
|
|
||||||
instance HasHttpManager App where
|
instance HasHttpManager App where
|
||||||
|
|||||||
@ -15,7 +15,7 @@ import qualified Data.Text as T
|
|||||||
getHoogleDB :: SnapName -> Handler (Maybe FilePath)
|
getHoogleDB :: SnapName -> Handler (Maybe FilePath)
|
||||||
getHoogleDB name = track "Handler.Hoogle.getHoogleDB" $ do
|
getHoogleDB name = track "Handler.Hoogle.getHoogleDB" $ do
|
||||||
app <- getYesod
|
app <- getYesod
|
||||||
liftIO $ Cron.getHoogleDB True (appHttpManager app) name
|
liftIO $ Cron.getHoogleDB (appHoogleLocker app) True (appHttpManager app) name
|
||||||
|
|
||||||
getHoogleR :: SnapName -> Handler Html
|
getHoogleR :: SnapName -> Handler Html
|
||||||
getHoogleR name = track "Handler.Hoogle.getHoogleR" $ do
|
getHoogleR name = track "Handler.Hoogle.getHoogleR" $ do
|
||||||
|
|||||||
@ -2,6 +2,8 @@ module Stackage.Database.Cron
|
|||||||
( stackageServerCron
|
( stackageServerCron
|
||||||
, loadFromS3
|
, loadFromS3
|
||||||
, getHoogleDB
|
, getHoogleDB
|
||||||
|
, HoogleLocker
|
||||||
|
, newHoogleLocker
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import ClassyPrelude.Conduit
|
import ClassyPrelude.Conduit
|
||||||
@ -122,31 +124,65 @@ hoogleUrl n = concat
|
|||||||
, hoogleKey n
|
, hoogleKey n
|
||||||
]
|
]
|
||||||
|
|
||||||
getHoogleDB :: Bool -- ^ print exceptions?
|
newtype HoogleLocker = HoogleLocker (TVar (Map FilePath (MVar ())))
|
||||||
|
|
||||||
|
newHoogleLocker :: IO HoogleLocker
|
||||||
|
newHoogleLocker = HoogleLocker <$> newTVarIO mempty
|
||||||
|
|
||||||
|
data Finished a = Finished a | TryAgain
|
||||||
|
|
||||||
|
getHoogleDB :: HoogleLocker
|
||||||
|
-> Bool -- ^ print exceptions?
|
||||||
-> Manager -> SnapName -> IO (Maybe FilePath)
|
-> Manager -> SnapName -> IO (Maybe FilePath)
|
||||||
getHoogleDB toPrint man name = do
|
getHoogleDB (HoogleLocker locker) toPrint man name = do
|
||||||
let fp = fromText $ hoogleKey name
|
let fp = fromText $ hoogleKey name
|
||||||
fptmp = encodeString fp <.> "tmp"
|
fptmp = encodeString fp <.> "tmp"
|
||||||
exists <- isFile fp
|
|
||||||
if exists
|
baton <- newMVar ()
|
||||||
then return $ Just (encodeString fp)
|
|
||||||
else do
|
let go :: IO (Finished (Maybe FilePath))
|
||||||
req' <- parseUrl $ unpack $ hoogleUrl name
|
go = withMVar baton $ \() -> bracket acquire fst snd
|
||||||
let req = req'
|
|
||||||
{ checkStatus = \_ _ _ -> Nothing
|
acquire :: IO (IO (), IO (Finished (Maybe FilePath)))
|
||||||
, decompress = const False
|
acquire = atomically $ do
|
||||||
}
|
m <- readTVar locker
|
||||||
withResponse req man $ \res -> if responseStatus res == status200
|
case lookup (encodeString fp) m of
|
||||||
then do
|
Just baton' -> return (return (), readMVar baton' $> TryAgain)
|
||||||
createTree $ parent (fromString fptmp)
|
Nothing -> do
|
||||||
runResourceT $ bodyReaderSource (responseBody res)
|
modifyTVar locker $ insertMap (encodeString fp) baton
|
||||||
$= ungzip
|
let cleanup = modifyTVar locker $ deleteMap (encodeString fp)
|
||||||
$$ sinkFile fptmp
|
return (atomically $ cleanup, Finished <$> inner)
|
||||||
rename (fromString fptmp) fp
|
|
||||||
return $ Just $ encodeString fp
|
|
||||||
|
inner = do
|
||||||
|
exists <- isFile fp
|
||||||
|
if exists
|
||||||
|
then return $ Just (encodeString fp)
|
||||||
else do
|
else do
|
||||||
when toPrint $ mapM brRead res >>= print
|
req' <- parseUrl $ unpack $ hoogleUrl name
|
||||||
return Nothing
|
let req = req'
|
||||||
|
{ checkStatus = \_ _ _ -> Nothing
|
||||||
|
, decompress = const False
|
||||||
|
}
|
||||||
|
withResponse req man $ \res -> if responseStatus res == status200
|
||||||
|
then do
|
||||||
|
createTree $ parent (fromString fptmp)
|
||||||
|
runResourceT $ bodyReaderSource (responseBody res)
|
||||||
|
$= ungzip
|
||||||
|
$$ sinkFile fptmp
|
||||||
|
rename (fromString fptmp) fp
|
||||||
|
return $ Just $ encodeString fp
|
||||||
|
else do
|
||||||
|
when toPrint $ mapM brRead res >>= print
|
||||||
|
return Nothing
|
||||||
|
|
||||||
|
loop :: IO (Maybe FilePath)
|
||||||
|
loop = do
|
||||||
|
mres <- go
|
||||||
|
case mres of
|
||||||
|
TryAgain -> loop
|
||||||
|
Finished res -> return res
|
||||||
|
loop
|
||||||
|
|
||||||
stackageServerCron :: IO ()
|
stackageServerCron :: IO ()
|
||||||
stackageServerCron = do
|
stackageServerCron = do
|
||||||
@ -154,6 +190,8 @@ stackageServerCron = do
|
|||||||
void $ catchIO (bindPortTCP 17834 "127.0.0.1") $ \_ ->
|
void $ catchIO (bindPortTCP 17834 "127.0.0.1") $ \_ ->
|
||||||
error $ "cabal loader process already running, exiting"
|
error $ "cabal loader process already running, exiting"
|
||||||
|
|
||||||
|
locker <- newHoogleLocker
|
||||||
|
|
||||||
env <- newEnv NorthVirginia Discover
|
env <- newEnv NorthVirginia Discover
|
||||||
let upload :: FilePath -> ObjectKey -> IO ()
|
let upload :: FilePath -> ObjectKey -> IO ()
|
||||||
upload fp key = do
|
upload fp key = do
|
||||||
@ -193,7 +231,7 @@ stackageServerCron = do
|
|||||||
names <- runReaderT last5Lts5Nightly db
|
names <- runReaderT last5Lts5Nightly db
|
||||||
let manager = view envManager env
|
let manager = view envManager env
|
||||||
forM_ names $ \name -> do
|
forM_ names $ \name -> do
|
||||||
mfp <- getHoogleDB False manager name
|
mfp <- getHoogleDB locker False manager name
|
||||||
case mfp of
|
case mfp of
|
||||||
Just _ -> putStrLn $ "Hoogle database exists for: " ++ toPathPiece name
|
Just _ -> putStrLn $ "Hoogle database exists for: " ++ toPathPiece name
|
||||||
Nothing -> do
|
Nothing -> do
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user