mirror of
https://github.com/facebook/Haxl.git
synced 2024-12-24 01:04:21 +03:00
Don't drop async exceptions (e.g. AllocationLimitExceeded)
Summary: Turning IO monad exceptions into Haxl monad exceptions can result in the IO monad exception being lost, which is what was happening to our AllocationLimitExceeded exceptions. See the comment with rethrowAsyncExceptions for more details. See also D1870627 Test Plan: P19741543 is a request that blows the alloc limit but wasn't being caught before. Reviewed By: akr@fb.com Subscribers: ldbrandy, memo, watashi, smarlow, akr, bnitka, jcoens FB internal diff: D1870631 Tasks: 6240444 Signature: t1:1870631:1424867073:d03bd0368ee968cecbcc5a0f654772b6f0eaf147
This commit is contained in:
parent
96f5513f56
commit
c67b7af2e0
@ -46,9 +46,10 @@ import Haxl.Core.Util
|
|||||||
import Haxl.Core.DataCache as DataCache
|
import Haxl.Core.DataCache as DataCache
|
||||||
|
|
||||||
import qualified Data.Text as Text
|
import qualified Data.Text as Text
|
||||||
import Control.Exception (Exception(..), SomeException)
|
import Control.Exception (Exception(..), SomeException, SomeAsyncException(..),
|
||||||
|
AllocationLimitExceeded(..))
|
||||||
import Control.Monad
|
import Control.Monad
|
||||||
import qualified Control.Exception
|
import qualified Control.Exception as Exception
|
||||||
import Control.Applicative hiding (Const)
|
import Control.Applicative hiding (Const)
|
||||||
import GHC.Exts (IsString(..))
|
import GHC.Exts (IsString(..))
|
||||||
#if __GLASGOW_HASKELL__ < 706
|
#if __GLASGOW_HASKELL__ < 706
|
||||||
@ -187,7 +188,7 @@ runHaxl env h = do
|
|||||||
traceEventIO "STOP computation"
|
traceEventIO "STOP computation"
|
||||||
case e of
|
case e of
|
||||||
Done a -> return a
|
Done a -> return a
|
||||||
Throw e -> Control.Exception.throw e
|
Throw e -> Exception.throw e
|
||||||
Blocked cont -> do
|
Blocked cont -> do
|
||||||
bs <- readIORef ref
|
bs <- readIORef ref
|
||||||
writeIORef ref noRequests -- Note [RoundId]
|
writeIORef ref noRequests -- Note [RoundId]
|
||||||
@ -205,7 +206,7 @@ runHaxl env (GenHaxl haxl) = do
|
|||||||
e <- haxl env ref
|
e <- haxl env ref
|
||||||
case e of
|
case e of
|
||||||
Done a -> return a
|
Done a -> return a
|
||||||
Throw e -> Control.Exception.throw e
|
Throw e -> Exception.throw e
|
||||||
Blocked cont -> do
|
Blocked cont -> do
|
||||||
bs <- readIORef ref
|
bs <- readIORef ref
|
||||||
writeIORef ref noRequests -- Note [RoundId]
|
writeIORef ref noRequests -- Note [RoundId]
|
||||||
@ -264,7 +265,7 @@ unsafeLiftIO m = GenHaxl $ \_env _ref -> Done <$> m
|
|||||||
-- order. Not to be exposed to user code.
|
-- order. Not to be exposed to user code.
|
||||||
unsafeToHaxlException :: GenHaxl u a -> GenHaxl u a
|
unsafeToHaxlException :: GenHaxl u a -> GenHaxl u a
|
||||||
unsafeToHaxlException (GenHaxl m) = GenHaxl $ \env ref -> do
|
unsafeToHaxlException (GenHaxl m) = GenHaxl $ \env ref -> do
|
||||||
r <- m env ref `Control.Exception.catch` \e -> return (Throw e)
|
r <- m env ref `Exception.catch` \e -> return (Throw e)
|
||||||
case r of
|
case r of
|
||||||
Blocked c -> return (Blocked (unsafeToHaxlException c))
|
Blocked c -> return (Blocked (unsafeToHaxlException c))
|
||||||
other -> return other
|
other -> return other
|
||||||
@ -364,15 +365,20 @@ continueFetch req rvar = GenHaxl $ \_env _ref -> do
|
|||||||
Just r -> done r
|
Just r -> done r
|
||||||
|
|
||||||
-- | Transparently provides caching. Useful for datasources that can
|
-- | Transparently provides caching. Useful for datasources that can
|
||||||
-- return immediately, but also caches values.
|
-- return immediately, but also caches values. Exceptions thrown by
|
||||||
|
-- the IO operation (except for asynchronous exceptions) are
|
||||||
|
-- propagated into the Haxl monad and can be caught by 'catch' and
|
||||||
|
-- 'try'.
|
||||||
cacheResult :: (Request r a) => r a -> IO a -> GenHaxl u a
|
cacheResult :: (Request r a) => r a -> IO a -> GenHaxl u a
|
||||||
cacheResult req val = GenHaxl $ \env _ref -> do
|
cacheResult req val = GenHaxl $ \env _ref -> do
|
||||||
cachedResult <- cached env req
|
cachedResult <- cached env req
|
||||||
case cachedResult of
|
case cachedResult of
|
||||||
Uncached rvar -> do
|
Uncached rvar -> do
|
||||||
result <- Control.Exception.try val
|
result <- Exception.try val
|
||||||
putResult rvar result
|
putResult rvar result
|
||||||
done result
|
case result of
|
||||||
|
Left e -> do rethrowAsyncExceptions e; done result
|
||||||
|
_other -> done result
|
||||||
Cached result -> done result
|
Cached result -> done result
|
||||||
CachedNotFetched _ -> corruptCache
|
CachedNotFetched _ -> corruptCache
|
||||||
where
|
where
|
||||||
@ -384,6 +390,41 @@ cacheResult req val = GenHaxl $ \env _ref -> do
|
|||||||
, " cacheResult on a query that involves a blocking fetch."
|
, " cacheResult on a query that involves a blocking fetch."
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
-- We must be careful about turning IO monad exceptions into Haxl
|
||||||
|
-- exceptions. An IO monad exception will normally propagate right
|
||||||
|
-- out of runHaxl and terminate the whole computation, whereas a Haxl
|
||||||
|
-- exception can get dropped on the floor, if it is on the right of
|
||||||
|
-- <*> and the left side also throws, for example. So turning an IO
|
||||||
|
-- monad exception into a Haxl exception is a dangerous thing to do.
|
||||||
|
-- In particular, we never want to do it for an asynchronous exception
|
||||||
|
-- (AllocationLimitExceeded, ThreadKilled, etc.), because these are
|
||||||
|
-- supposed to unconditionally terminate the computation.
|
||||||
|
--
|
||||||
|
-- There are three places where we take an arbitrary IO monad exception and
|
||||||
|
-- turn it into a Haxl exception:
|
||||||
|
--
|
||||||
|
-- * wrapFetchInCatch. Here we want to propagate a failure of the
|
||||||
|
-- data source to the callers of the data source, but if the
|
||||||
|
-- failure came from elsewhere (an asynchronous exception), then we
|
||||||
|
-- should just propagate it
|
||||||
|
--
|
||||||
|
-- * cacheResult (cache the results of IO operations): again,
|
||||||
|
-- failures of the IO operation should be visible to the caller as
|
||||||
|
-- a Haxl exception, but we exclude asynchronous exceptions from
|
||||||
|
-- this.
|
||||||
|
|
||||||
|
-- * unsafeToHaxlException: assume the caller knows what they're
|
||||||
|
-- doing, and just wrap all exceptions.
|
||||||
|
--
|
||||||
|
rethrowAsyncExceptions :: SomeException -> IO ()
|
||||||
|
rethrowAsyncExceptions e
|
||||||
|
| Just SomeAsyncException{} <- fromException e = Exception.throw e
|
||||||
|
| Just AllocationLimitExceeded{} <- fromException e = Exception.throw e
|
||||||
|
-- AllocationLimitExceeded is not a child of SomeAsyncException,
|
||||||
|
-- but it should be.
|
||||||
|
| otherwise = return ()
|
||||||
|
|
||||||
-- | Inserts a request/result pair into the cache. Throws an exception
|
-- | Inserts a request/result pair into the cache. Throws an exception
|
||||||
-- if the request has already been issued, either via 'dataFetch' or
|
-- if the request has already been issued, either via 'dataFetch' or
|
||||||
-- 'cacheRequest'.
|
-- 'cacheRequest'.
|
||||||
@ -493,12 +534,14 @@ wrapFetchInCatch :: [BlockedFetch req] -> PerformFetch -> PerformFetch
|
|||||||
wrapFetchInCatch reqs fetch =
|
wrapFetchInCatch reqs fetch =
|
||||||
case fetch of
|
case fetch of
|
||||||
SyncFetch io ->
|
SyncFetch io ->
|
||||||
SyncFetch (io `Control.Exception.catch` handler)
|
SyncFetch (io `Exception.catch` handler)
|
||||||
AsyncFetch fio ->
|
AsyncFetch fio ->
|
||||||
AsyncFetch (\io -> fio io `Control.Exception.catch` handler)
|
AsyncFetch (\io -> fio io `Exception.catch` handler)
|
||||||
where
|
where
|
||||||
handler :: SomeException -> IO ()
|
handler :: SomeException -> IO ()
|
||||||
handler e = mapM_ (forceError e) reqs
|
handler e = do
|
||||||
|
rethrowAsyncExceptions e
|
||||||
|
mapM_ (forceError e) reqs
|
||||||
|
|
||||||
-- Set the exception even if the request already had a result.
|
-- Set the exception even if the request already had a result.
|
||||||
-- Otherwise we could be discarding an exception.
|
-- Otherwise we could be discarding an exception.
|
||||||
@ -609,22 +652,33 @@ cachedComputation req haxl = GenHaxl $ \env ref -> do
|
|||||||
MemoInProgress round cont
|
MemoInProgress round cont
|
||||||
| round == ref -> return (Blocked (retryMemo req))
|
| round == ref -> return (Blocked (retryMemo req))
|
||||||
| otherwise -> run memovar cont env ref
|
| otherwise -> run memovar cont env ref
|
||||||
|
-- was blocked in a previous round; run the saved continuation to
|
||||||
|
-- make more progress.
|
||||||
where
|
where
|
||||||
-- If we got blocked on this memo previously, this is the continuation:
|
-- If we got blocked on this memo in the current round, this is the
|
||||||
-- just try to evaluate the memo again. It is guaranteed to be in the
|
-- continuation: just try to evaluate the memo again. We know it is
|
||||||
-- cache now (perhaps only partially evaluated though).
|
-- already in the cache (because we just checked), so the computation
|
||||||
|
-- will never be used.
|
||||||
retryMemo req =
|
retryMemo req =
|
||||||
cachedComputation req (throw (CriticalError "retryMemo"))
|
cachedComputation req (throw (CriticalError "retryMemo"))
|
||||||
|
|
||||||
-- Run the memoized computation and store the result (complete or
|
-- Run the memoized computation and store the result (complete or
|
||||||
-- partial) back in the MemoVar afterwards.
|
-- partial) back in the MemoVar afterwards.
|
||||||
|
--
|
||||||
|
-- We don't attempt to catch IO monad exceptions here. That may seem
|
||||||
|
-- dangerous, because if an IO exception is raised we'll leave the
|
||||||
|
-- MemoInProgress in the MemoVar. But we always want to just
|
||||||
|
-- propagate an IO monad exception (it should kill the whole runHaxl,
|
||||||
|
-- unless there's a unsafeToHaxlException), so we should never be
|
||||||
|
-- looking at the MemoVar again anyway. Furthermore, storing the
|
||||||
|
-- exception in the MemoVar is wrong, because that will turn it into
|
||||||
|
-- a Haxl exception (see rethrowAsyncExceptions).
|
||||||
run memovar cont env ref = do
|
run memovar cont env ref = do
|
||||||
e <- Control.Exception.try $ unHaxl cont env ref
|
e <- unHaxl cont env ref
|
||||||
case e of
|
case e of
|
||||||
Left ex -> complete memovar (Left ex)
|
Done a -> complete memovar (Right a)
|
||||||
Right (Done a) -> complete memovar (Right a)
|
Throw e -> complete memovar (Left e)
|
||||||
Right (Throw e) -> complete memovar (Left e)
|
Blocked cont -> do
|
||||||
Right (Blocked cont) -> do
|
|
||||||
writeIORef memovar (MemoInProgress ref cont)
|
writeIORef memovar (MemoInProgress ref cont)
|
||||||
return (Blocked (retryMemo req))
|
return (Blocked (retryMemo req))
|
||||||
|
|
||||||
@ -633,7 +687,6 @@ cachedComputation req haxl = GenHaxl $ \env ref -> do
|
|||||||
writeIORef memovar (MemoDone r)
|
writeIORef memovar (MemoDone r)
|
||||||
done r
|
done r
|
||||||
|
|
||||||
|
|
||||||
-- | Lifts an 'Either' into either 'Throw' or 'Done'.
|
-- | Lifts an 'Either' into either 'Throw' or 'Done'.
|
||||||
done :: Either SomeException a -> IO (Result u a)
|
done :: Either SomeException a -> IO (Result u a)
|
||||||
done = return . either Throw Done
|
done = return . either Throw Done
|
||||||
|
@ -24,6 +24,8 @@ import Haxl.Core
|
|||||||
|
|
||||||
import Data.Typeable
|
import Data.Typeable
|
||||||
import Data.Hashable
|
import Data.Hashable
|
||||||
|
import Control.Concurrent
|
||||||
|
import System.IO
|
||||||
|
|
||||||
-- Here is an example minimal data source. Our data source will have
|
-- Here is an example minimal data source. Our data source will have
|
||||||
-- two requests:
|
-- two requests:
|
||||||
@ -134,6 +136,9 @@ fetch1 (BlockedFetch (CountAardvarks "BANG2") m) = do
|
|||||||
putSuccess m 1
|
putSuccess m 1
|
||||||
error "BANG2" -- the exception is propagated even if we have already
|
error "BANG2" -- the exception is propagated even if we have already
|
||||||
-- put the result with putSuccess
|
-- put the result with putSuccess
|
||||||
|
fetch1 (BlockedFetch (CountAardvarks "BANG3") _) = do
|
||||||
|
hPutStr stderr "BANG3"
|
||||||
|
killThread =<< myThreadId -- an asynchronous exception
|
||||||
fetch1 (BlockedFetch (CountAardvarks str) m) =
|
fetch1 (BlockedFetch (CountAardvarks str) m) =
|
||||||
putSuccess m (length (filter (== 'a') str))
|
putSuccess m (length (filter (== 'a') str))
|
||||||
fetch1 (BlockedFetch (ListWombats a) r) =
|
fetch1 (BlockedFetch (ListWombats a) r) =
|
||||||
|
@ -124,17 +124,31 @@ cachedComputationTest = TestCase $ do
|
|||||||
|
|
||||||
dataSourceExceptionTest = TestCase $ do
|
dataSourceExceptionTest = TestCase $ do
|
||||||
env <- testEnv
|
env <- testEnv
|
||||||
|
|
||||||
r <- runHaxl env $ Haxl.try $ countAardvarks "BANG"
|
r <- runHaxl env $ Haxl.try $ countAardvarks "BANG"
|
||||||
assertBool "exception" $
|
assertBool "exception1" $
|
||||||
case r of
|
case r of
|
||||||
Left (ErrorCall "BANG") -> True
|
Left (ErrorCall "BANG") -> True
|
||||||
_ -> False
|
_ -> False
|
||||||
r <- runHaxl env $ Haxl.try $ countAardvarks "BANG2"
|
r <- runHaxl env $ Haxl.try $ countAardvarks "BANG2"
|
||||||
assertBool "exception" $
|
assertBool "exception2" $
|
||||||
case r of
|
case r of
|
||||||
Left (ErrorCall "BANG2") -> True
|
Left (ErrorCall "BANG2") -> True
|
||||||
_ -> False
|
_ -> False
|
||||||
|
|
||||||
|
-- In this test, BANG3 is an asynchronous exception (ThreadKilled),
|
||||||
|
-- so we should see that instead of the exception on the left.
|
||||||
|
-- Furthermore, it doesn't get caught by Haxl.try, and we have to
|
||||||
|
-- catch it outside of runHaxl.
|
||||||
|
env <- testEnv
|
||||||
|
r <- Control.Exception.try $ runHaxl env $ Haxl.try $
|
||||||
|
(length <$> listWombats 100) + countAardvarks "BANG3"
|
||||||
|
print r
|
||||||
|
assertBool "exception3" $
|
||||||
|
case (r :: Either AsyncException (Either SomeException Int)) of
|
||||||
|
Left ThreadKilled -> True
|
||||||
|
_ -> False
|
||||||
|
|
||||||
-- Test that we can load the cache from a dumped copy of it, and then dump it
|
-- Test that we can load the cache from a dumped copy of it, and then dump it
|
||||||
-- again to get the same result.
|
-- again to get the same result.
|
||||||
dumpCacheTest = TestCase $ do
|
dumpCacheTest = TestCase $ do
|
||||||
|
Loading…
Reference in New Issue
Block a user