quic: fix flaky assertion error

PR-URL: nodejs#292 Reviewed-By: Anna Henningsen <[email protected]>
jasnell · Feb 3, 2020 · 86b2c14 · 86b2c14
1 parent 44216d0
commit 86b2c14
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/quic/node_quic_default_application.cc b/src/quic/node_quic_default_application.cc
@@ -146,12 +146,14 @@ int DefaultApplication::GetStreamData(StreamData* stream_data) {
     }
   };
 
-  CHECK_GE(stream->Pull(
-      std::move(next),
-      bob::Options::OPTIONS_SYNC,
-      stream_data->data,
-      arraysize(stream_data->data),
-      kMaxVectorCount), 0);
+  if (LIKELY(!stream->is_eos())) {
+    CHECK_GE(stream->Pull(
+        std::move(next),
+        bob::Options::OPTIONS_SYNC,
+        stream_data->data,
+        arraysize(stream_data->data),
+        kMaxVectorCount), 0);
+  }
 
   return 0;
 }

diff --git a/src/quic/node_quic_stream.cc b/src/quic/node_quic_stream.cc
@@ -240,7 +240,6 @@ int QuicStream::ReadStop() {
 void QuicStream::IncrementStats(size_t datalen) {
   uint64_t len = static_cast<uint64_t>(datalen);
   IncrementStat(&QuicStreamStats::bytes_received, len);
-
   RecordRate(&QuicStreamStats::received_at);
   RecordSize(len);
 }
@@ -318,6 +317,7 @@ void QuicStream::ReceiveData(
     // on the stream when data transfer rates are likely to be considered too
     // slow.
     IncrementStats(datalen);
+
     while (datalen > 0) {
       uv_buf_t buf = EmitAlloc(datalen);
       size_t avail = std::min(static_cast<size_t>(buf.len), datalen);