Index: be/src/exec/scanner-context.cc
===================================================================
--- be/src/exec/scanner-context.cc	(revision 93117)
+++ be/src/exec/scanner-context.cc	(working copy)
@@ -217,6 +217,9 @@
   *eos = true;
 
   if (current_buffer_bytes_left_ == 0 && current_buffer_ != NULL) {
+    if (current_buffer_->eosr()) {
+      read_eosr_ = true;
+    }
     unique_lock<mutex> l(parent_->lock_);
     RemoveFirstBuffer();
   }