[CDEC-469] Catch reporter IOExceptions in retrievalWorker

Author: coot

block/src/Pos/Block/Network/Retrieval.hs

@@ -10,12 +10,13 @@ import           Universum
 
 import           Control.Concurrent.STM (putTMVar, swapTMVar, tryReadTBQueue, tryReadTMVar,
                                          tryTakeTMVar, readTBQueue, TBQueue)
-import           Control.Exception.Safe (handleAny)
+import           Control.Exception (IOException)
+import           Control.Exception.Safe (catch, handleAny)
 import           Control.Lens (to)
 import           Control.Monad.STM (retry)
 import qualified Data.List.NonEmpty as NE
 import           Data.Time.Units (Second)
-import           Formatting (build, int, sformat, (%))
+import           Formatting (build, int, sformat, shown, (%))
 import           Mockable (delay)
 import qualified System.Metrics.Gauge as Gauge
 import           System.Wlog (logDebug, logError, logInfo, logWarning)
@@ -26,7 +27,8 @@ import           Pos.Block.Network.Logic (BlockNetLogicException (..), handleBlo
                                           triggerRecovery)
 import           Pos.Block.RetrievalQueue (BlockRetrievalQueueTag, BlockRetrievalTask (..))
 import           Pos.Block.Types (RecoveryHeaderTag)
-import           Pos.Core (Block, HasHeaderHash (..), HeaderHash, difficultyL, isMoreDifficult)
+import           Pos.Core (Block, HasHeaderHash (..), HeaderHash, difficultyL, headerHashF,
+                     isMoreDifficult)
 import           Pos.Core.Block (BlockHeader)
 import           Pos.Core.Chrono (NE, OldestFirst (..), _OldestFirst)
 import           Pos.Crypto (ProtocolMagic, shortHashF)
@@ -147,10 +149,15 @@ retrievalWorker pm diffusion = do
     -- again.
     handleRecoveryE nodeId rHeader e = do
         -- REPORT:ERROR 'reportOrLogW' in block retrieval worker/recovery.
-        reportOrLogW (sformat
-            ("handleRecoveryE: error handling nodeId="%build%", header="%build%": ")
-            nodeId (headerHash rHeader)) e
+        reportOrLogW (sformat errfmt nodeId (headerHash rHeader)) e
+            `catch` handleIOException
         dropRecoveryHeaderAndRepeat pm diffusion nodeId
+        where
+            errfmt = "handleRecoveryE: error handling nodeId="%build%", header="%headerHashF%": "
+
+            handleIOException :: IOException -> m ()
+            handleIOException _ = logError $ sformat (errfmt%shown) nodeId (headerHash rHeader) e
+
 
     -- Recovery handling. We assume that header in the recovery variable is
     -- appropriate and just query headers/blocks.