From c1c211365acf445d743890ca76742146400fdfc0 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 28 Apr 2020 17:24:04 +0200
Subject: [PATCH] FIX: Improve clearing store cache (#9568)

1. Shorter
2. Simpler
3. Doesn't depend on external binaries
4. Doesn't fail on large amounts of files
5. Hopefully eliminates flaky spec errors
---
 lib/file_store/base_store.rb | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index a3623f1fea4..c3752be1557 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -149,22 +149,12 @@ module FileStore
       FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
       FileUtils.cp(file.path, path)
 
-      # Keep latest 500 files
-      processes = Open3.pipeline(
-        ["ls -t #{CACHE_DIR}", err: "/dev/null"],
-        "tail -n +#{CACHE_MAXIMUM_SIZE + 1}",
-        "awk '$0=\"#{CACHE_DIR}\"$0'",
-        "xargs rm -f"
-      )
+      # Remove all but CACHE_MAXIMUM_SIZE most recent files
+      files = Dir.glob("#{CACHE_DIR}*")
+        .sort_by { |f| File.mtime(f) }
+        .slice(0...-CACHE_MAXIMUM_SIZE)
 
-      ls = processes.shift
-
-      # Exit status `1` in `ls` occurs when e.g. "listing a directory
-      # in which entries are actively being removed or renamed".
-      # It's safe to ignore it here.
-      if ![0, 1].include?(ls.exitstatus) || !processes.all?(&:success?)
-        raise "Error clearing old cache"
-      end
+      FileUtils.rm(files, force: true)
     end
 
     private