From 170fa382faa8e464216b700ef495a2d0b82d2ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Botond=20D=C3=A9nes?= <bdenes@scylladb.com>
Date: Thu, 6 Dec 2018 10:30:40 +0200
Subject: [PATCH] multishard_combining_reader: pause *all* EOS'd readers

Previously the last shard reader to reach EOS wasn't paused. This is a
mistake and can contribute to causing deadlocks when the number of
concurrently active readers on any shard is limited.
---
 mutation_reader.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mutation_reader.cc b/mutation_reader.cc
index 07a7adb49e..bce18cf3c3 100644
--- a/mutation_reader.cc
+++ b/mutation_reader.cc
@@ -1351,8 +1351,8 @@ future<> multishard_combining_reader::handle_empty_reader_buffer(db::timeout_clo
             _end_of_stream = true;
         } else {
             move_to_next_shard();
-            reader.pause();
         }
+        reader.pause();
         return make_ready_future<>();
     } else if (reader.is_read_ahead_in_progress()) {
         return reader.fill_buffer(timeout);