update reader timeout setting in subscription (#1387)

hstreamdb · Apr 28, 2023 · a0799d0 · a0799d0
1 parent 722fc61
commit a0799d0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/hstream/src/HStream/Server/Core/Subscription.hs b/hstream/src/HStream/Server/Core/Subscription.hs
@@ -352,7 +352,9 @@ doSubInit ServerContext{..} subId = do
       -- create a ldReader for rereading unacked records
       Log.info $ "Create a reader for " <> Log.build subId
       reader <- S.newLDReader scLDClient maxReadLogs (Just ldReaderBufferSize)
-      S.readerSetTimeout reader 10 -- 10 milliseconds
+      -- reader reads the data and delivers it immediately, otherwise it waits up to 1s
+      S.readerSetTimeout reader 1000 -- 1 seconds
+      S.readerSetWaitOnlyWhenNoData reader
       ldReader <- newMVar reader
 
       trimCkpWorker <- startCompactedWorker (60 * 1000000){- 60s -} $ do
@@ -732,11 +734,12 @@ sendRecords ServerContext{..} subState subCtx@SubscribeContext {..} = do
                  <> ", logId=" <> Log.build logId  <> ", batchId=" <> Log.build batchId
         dataRecord <- withMVar subLdReader $ \reader -> do
           S.readerStartReading reader logId batchId batchId
-          readLoop reader 3
-        if length dataRecord /= 1
+          S.readerRead reader 1
+        if null dataRecord
         then do
-          Log.fatal $ "read error on `readerRead`. Expect 1 record but got " <> Log.build (length dataRecord)
-                   <> ", logId " <> Log.build logId <> ", batchId " <> Log.build batchId
+          Log.info $ "sub resend reader read empty records from log "
+                  <> Log.build logId <> ", batchId " <> Log.build batchId
+                  <> ", retry next time"
         else do
           (_, _, _, ReceivedRecord{..}) <- decodeRecordBatch $ head dataRecord
           let batchRecords@BatchedRecord{..} = fromJust receivedRecordRecord
@@ -753,16 +756,6 @@ sendRecords ServerContext{..} subState subCtx@SubscribeContext {..} = do
               resendBatch = mkBatchedRecord batchedRecordCompressionType batchedRecordPublishTime (fromIntegral $ V.length records) records
               resendRecords = ReceivedRecord ids (Just resendBatch)
           void $ sendReceivedRecords logId batchId resendRecordIds resendRecords True
-     where
-      readLoop reader n
-        | n == 0 = return []
-        | otherwise = do
-          res <- S.readerRead reader 1
-          if null res
-             then do
-               Log.warning $ "reader read got empty result, logId " <> Log.build logId <> ", batchId " <> Log.build batchId <> ", retry."
-               readLoop reader (n - 1)
-             else return res
 
     filterUnackedRecordIds recordIds ackedRanges windowLowerBound =
       flip V.filter recordIds $ \recordId ->

diff --git a/hstream/test/HStream/RunSQLSpec.hs b/hstream/test/HStream/RunSQLSpec.hs
@@ -110,6 +110,8 @@ viewSpecAround = provideRunTest setup clean
     clean api (source1, source2, viewName, qName1, qName2) = do
       runTerminateSql api $ "TERMINATE QUERY " <> qName1 <> ";"
       runTerminateSql api $ "TERMINATE QUERY " <> qName2 <> ";"
+      -- FIXME: wait the query terminated
+      threadDelay 10000000
       runDropSql api $ "DROP VIEW " <> viewName <> " IF EXISTS;"
       runDropSql api $ "DROP STREAM " <> source2 <> " IF EXISTS;"
       runDropSql api $ "DROP STREAM " <> source1 <> " IF EXISTS;"