From edf24e7afc2417ecf9b496ef672a0447e8723e23 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Wed, 4 Oct 2023 15:54:57 +0000 Subject: [PATCH] Revert "yield to executor every time we move backwards" This reverts commit 49bf66a467492f05d40b57c428cbe0f521917502. --- pageserver/src/page_cache.rs | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pageserver/src/page_cache.rs b/pageserver/src/page_cache.rs index c5c85aa5cb..8e25fe04cf 100644 --- a/pageserver/src/page_cache.rs +++ b/pageserver/src/page_cache.rs @@ -884,21 +884,9 @@ impl PageCache { ) -> anyhow::Result<(usize, tokio::sync::RwLockWriteGuard)> { let iter_limit = self.slots.len() * 10; let mut iters = 0; - let mut last_slot_idx = None; loop { iters += 1; - let slot_idx = { - let next_idx = - self.next_evict_slot.fetch_add(1, Ordering::Relaxed) % self.slots.len(); - match (last_slot_idx, next_idx) { - (Some(x), y) if x > y => { - tokio::task::yield_now().await; - } - (None | Some(_), _) => {} - } - last_slot_idx = Some(next_idx); - next_idx - }; + let slot_idx = self.next_evict_slot.fetch_add(1, Ordering::Relaxed) % self.slots.len(); let slot = &self.slots[slot_idx];