dd39e9e255
When annex.stalldetection is not enabled, and a likely stall is detected, display a suggestion to enable it. Note that the progress meter display is not taken down when displaying the message, so it will display like this: 0% 8 B 0 B/s Transfer seems to have stalled. To handle stalling transfers, configure annex.stalldetection 0% 10 B 0 B/s Although of course if it's really stalled, it will never update again after the message. Taking down the progress meter and starting a new one doesn't seem too necessary given how unusual this is, also this does help show the state it was at when it stalled. Use of uninterruptibleCancel here is ok, the thread it's canceling only does STM transactions and sleeps. The annex thread that gets forked off is separate to avoid it being canceled, so that it can be joined back at the end. A module cycle required moving from dupState the precaching of the remote list. Doing it at startConcurrency should cover all the cases where the remote list is used in concurrent actions. This commit was sponsored by Kevin Mueller on Patreon.
42 lines
1.2 KiB
Haskell
42 lines
1.2 KiB
Haskell
{- types for stall detection
|
|
-
|
|
- Copyright 2020-2021 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Types.StallDetection where
|
|
|
|
import Utility.DataUnits
|
|
import Utility.HumanTime
|
|
import Utility.Misc
|
|
import Git.Config
|
|
|
|
data StallDetection
|
|
= StallDetection ByteSize Duration
|
|
-- ^ Unless the given number of bytes have been sent over the given
|
|
-- amount of time, there's a stall.
|
|
| ProbeStallDetection
|
|
-- ^ Used when unsure how frequently transfer progress is updated,
|
|
-- or how fast data can be sent.
|
|
| StallDetectionDisabled
|
|
deriving (Show)
|
|
|
|
-- Parse eg, "0KiB/60s"
|
|
--
|
|
-- Also, it can be set to "true" (or other git config equivilants)
|
|
-- to enable ProbeStallDetection.
|
|
-- And "false" (and other git config equivilants) explicitly
|
|
-- disable stall detection.
|
|
parseStallDetection :: String -> Either String (Maybe StallDetection)
|
|
parseStallDetection s = case isTrueFalse s of
|
|
Nothing -> do
|
|
let (bs, ds) = separate (== '/') s
|
|
b <- maybe
|
|
(Left $ "Unable to parse stall detection amount " ++ bs)
|
|
Right
|
|
(readSize dataUnits bs)
|
|
d <- parseDuration ds
|
|
return (Just (StallDetection b d))
|
|
Just True -> Right (Just ProbeStallDetection)
|
|
Just False -> Right (Just StallDetectionDisabled)
|