voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip. Better wait. Uses the probe Download.wip ... 

instead of sqlite query (RpcDownloadList)
This commit is contained in:
voidlizard 2025-01-23 05:38:49 +03:00
parent a240bc23f0
commit dcd13663d9
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbs2-git3/app/GitRemoteHelper.hs
View File

@ -194,7 +194,7 @@ main = flip runContT pure do
url <- case cli of url <- case cli of
[ ListVal [_, RepoURL x ] ] -> do [ ListVal [_, RepoURL x ] ] -> do
notice $ "FUCKING REMOTE" <+> pretty (AsBase58 x) notice $ "git remote ref set:" <+> green (pretty (AsBase58 x))
setGitRepoKey x setGitRepoKey x
pure $ Just x pure $ Just x

14
hbs2-git3/lib/HBS2/Git3/Import.hs
View File

@ -113,6 +113,8 @@ data ImportStage =
| ImportWait (Maybe Int) ImportStage | ImportWait (Maybe Int) ImportStage
| ImportDone (Maybe HashRef) | ImportDone (Maybe HashRef)
{- HLINT ignore "Functor law" -}
importGitRefLog :: forall m . ( HBS2GitPerks m importGitRefLog :: forall m . ( HBS2GitPerks m
-- , HasStorage m -- , HasStorage m
-- , HasClientAPI PeerAPI UNIX m -- , HasClientAPI PeerAPI UNIX m
@ -145,16 +147,20 @@ importGitRefLog = withStateDo $ ask >>= \case
ImportWait d next -> do ImportWait d next -> do
down <- callRpcWaitMay @RpcDownloadList (TimeoutSec 1) peerAPI () pause @'Seconds 1.15
down <- callRpcWaitRetry @RpcGetProbes (TimeoutSec 1) 3 peerAPI ()
>>= orThrow RpcTimeout >>= orThrow RpcTimeout
<&> fromIntegral . L.length <&> maybe 0 fromIntegral . headMay . mapMaybe \case
ProbeSnapshotElement "Download.wip" n -> Just n
_ -> Nothing
notice $ "wait some time..." <+> parens (pretty down) notice $ "wait some time..." <+> parens (pretty down)
case d of case d of
Just n | down < n || down == 0 -> again next Just n | down /= n || down == 0 -> again next
_ -> pause @'Seconds 3 >> again (ImportWait (Just down) next) _ -> pause @'Seconds 2.85 >> again (ImportWait (Just down) next)
ImportStart -> do ImportStart -> do

2
hbs2-peer/app/BlockDownloadNew.hs
View File

@ -650,7 +650,7 @@ downloadDispatcher probe brains env = do
dupes <- newTVarIO ( mempty :: HashMap HashRef Int ) dupes <- newTVarIO ( mempty :: HashMap HashRef Int )
ContT $ withAsync $ forever $ pause @'Seconds 10 >> do ContT $ withAsync $ forever $ pause @'Seconds 2 >> do
acceptReport probe =<< S.toList_ do acceptReport probe =<< S.toList_ do
wip <- readTVarIO wip <&> HM.size wip <- readTVarIO wip <&> HM.size
pn <- readTVarIO pts <&> HM.size pn <- readTVarIO pts <&> HM.size