Split cleanups from backups, so the one doesn't hold up the other

config/schedule.rb

@@ -23,6 +23,16 @@
 
 job_type :rake, "cd :path && SOLR_ENV=:environment HOST=:host bundle exec rake :task"
 
-every 1.day, roles: [:db] do
+# Default time is midnight UTC, which is:
+#   7pm EST / 6pm EDT the evening before
+#   4pm PST / 3pm PDT the afternoon before
+every 1.day, roles: [:main] do
   rake "pul_solr:backup"
 end
+
+# Default time is midnight UTC, which is:
+#   7pm EST / 6pm EDT the evening before
+#   4pm PST / 3pm PDT the afternoon before
+every 1.day, roles: [:main] do
+  rake "pul_solr:cleanup"
+end

lib/pul_solr/backup_manager.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'logger'
 require 'json'
+require 'date'
 
 module PulSolr
   class BackupManager

lib/tasks/pul_solr.rake

@@ -11,10 +11,19 @@ namespace :pul_solr do
     abort "usage: rake pul_solr:backup HOST=solr8 SOLR_ENV=[production|staging]" unless (allowed_targets.include?(target) && allowed_hosts.include?(host))
     logger = Logger.new("/tmp/solr_backup.log", "monthly")
     backup_manager = PulSolr::BackupManager.new(host: host, solr_env: target, logger: logger)
-    backup_manager.cleanup_old_backups
     backup_manager.backup
   end
 
+  desc "clean up old collections on solrcloud server"
+  task "cleanup" do
+    target = ENV["SOLR_ENV"]
+    host = ENV["HOST"]
+    abort "usage: rake pul_solr:cleanup HOST=solr8 SOLR_ENV=[production|staging]" unless (allowed_targets.include?(target) && allowed_hosts.include?(host))
+    logger = Logger.new("/tmp/solr_backup.log", "monthly")
+    backup_manager = PulSolr::BackupManager.new(host: host, solr_env: target, logger: logger)
+    backup_manager.cleanup_old_backups
+  end
+
   desc "copies files from another project that has been checked out locally"
   task :sync do
     from_dir = ENV["FROM_DIR"]