WIP: remove sidekiq pausing as it’s been useless for at least a year

Author: Flink

lib/docker_manager/unicorn_adapter.rb

@@ -17,15 +17,5 @@ def master_pid
     def workers
       `pgrep -f -P #{master_pid} worker`.split("\n").map(&:to_i)
     end
-
-    def pause_sidekiq
-      return if ENV["UNICORN_SIDEKIQS"].to_i <= 0
-
-      log "Stopping job queue to reclaim memory, master pid is #{master_pid}"
-      Process.kill("TSTP", master_pid)
-      sleep 1
-      # Older versions do not have support, so quickly send a CONT so master process is not hung
-      Process.kill("CONT", master_pid)
-    end
   end
 end

lib/docker_manager/upgrader.rb

@@ -7,14 +7,14 @@
 class DockerManager::Upgrader
   attr_reader :web_server
 
-  delegate :min_workers, :server_name, to: :web_server
+  delegate :min_workers, :server_name, :launcher_pid, :master_pid, :workers, to: :web_server
 
   def initialize(user_id, repos, from_version)
     @user_id = user_id
     @user = User.find(user_id)
     @repos = repos.is_a?(Array) ? repos : [repos]
     @from_version = from_version
-    @web_server = select_web_server_adapter
+    @web_server = web_server_adapter
   end
 
   def reset!
@@ -36,12 +36,12 @@ def upgrade
     log("*** Please be patient, next steps might take a while ***")
     log("********************************************************")
 
-    if web_server.workers.size <= min_workers
+    if workers.size <= min_workers
       log("ABORTING, you do not have enough #{server_name} workers running")
       raise "Not enough workers"
     end
 
-    if web_server.launcher_pid <= 0 || web_server.master_pid <= 0
+    if launcher_pid <= 0 || master_pid <= 0
       log("ABORTING, missing #{server_name} launcher or master/monitor")
       raise "No #{server_name} master or launcher"
     end
@@ -53,15 +53,13 @@ def upgrade
 
     percent(10)
     reloaded = false
-    num_workers_spun_down = web_server.workers.size - min_workers
+    num_workers_spun_down = workers.size - min_workers
 
     if num_workers_spun_down.positive?
       log "Stopping #{num_workers_spun_down} #{server_name} worker(s), to free up memory"
       web_server.scale_down_workers(num_workers_spun_down)
     end
 
-    web_server.pause_sidekiq
-
     # HEAD@{upstream} is just a fancy way how to say origin/main (in normal case)
     # see http://stackoverflow.com/a/12699604/84283
     @repos.each_with_index do |repo, index|
@@ -265,7 +263,7 @@ def log_version_upgrade
 
   private
 
-  def select_web_server_adapter
+  def web_server_adapter
     if `pgrep -f '^unicorn[^_]'`.present?
       DockerManager::UnicornAdapter
     else

lib/docker_manager/web_server_adapter.rb

@@ -24,9 +24,6 @@ def scale_up_workers(count)
       count.times { Process.kill("TTIN", master_pid) }
     end
 
-    def pause_sidekiq
-    end
-
     def min_workers
       1
     end