foreman_maintain 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a54e65aa9144d233ab256305556eebb5467cfd5c4fd9aa99b7971a13fdd81bac
-  data.tar.gz: ce6c5012139cc01bb4dee7f7cdb30a569ce3f05399d14d81d1c1cbf835588b31
+  metadata.gz: c5223427d91fd37a6dda0c341fada111c6555378cca050db661e81e4807bac53
+  data.tar.gz: 0ccf33ffe89749016e9b943b9421427f456e524fcd8a1d2f44a0aa3a02c7af8d
 SHA512:
-  metadata.gz: b94662b70f86ed91889688a3288dbe67d44ec46c9b1d3830f5a9687b0293500048ffd2df86162964e417a0ffa1514d78a43a0c4a1f7168848986bb92abe9828e
-  data.tar.gz: 0f2351eddc6236e7be70c44bc94e0ac4ae24b19b8f21dcf9d0a726a8897c4bea34bcb5bd5562827d1efb3400c421e2807288d56d1f5a03d5685ab2c402aa21b7
+  metadata.gz: fe155208da6aa978763d158e89f6552897a4d26e7aae09af6182c5d055988348176693050a5197f07203366083902bda7a76cb2d569298e52f7aa70723dc9ee0
+  data.tar.gz: c323b7a0c47767f86cfbc58b1d3257d0ce005f80ae9d73cdb908e98796db28e9d1044348bd78b35baef8bef714fbc8a59cc6925222db60bb80fe3b505594bb20

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -143,6 +143,9 @@ module ForemanMaintain
       end
 
       def version(value)
+        # packages versions, especially on Debian, sometimes include a + or a ~,
+        # but Gem::Version can't handle that.
+        value.gsub!(/[+~]/, '-')
         Version.new(value)
       end
 

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -113,7 +113,6 @@ description: Provides various features that helps keeping the Foreman/Satellite
 email: inecas@redhat.com
 executables:
 - foreman-maintain
-- passenger-recycler
 - foreman-maintain-complete
 - foreman-maintain-rotate-tar
 extensions: []
@@ -126,12 +125,10 @@ files:
 - bin/foreman-maintain
 - bin/foreman-maintain-complete
 - bin/foreman-maintain-rotate-tar
-- bin/passenger-recycler
 - config/foreman-maintain.completion
 - config/foreman_maintain.yml.example
 - config/foreman_maintain.yml.packaging
 - config/hammer.yml.example
-- config/passenger-recycler.yaml
 - definitions/checks/backup/certs_tar_exist.rb
 - definitions/checks/backup/directory_ready.rb
 - definitions/checks/candlepin/db_up.rb
@@ -281,7 +278,6 @@ files:
 - definitions/procedures/packages/unlock_versions.rb
 - definitions/procedures/packages/update.rb
 - definitions/procedures/packages/update_all_confirmation.rb
-- definitions/procedures/passenger_recycler.rb
 - definitions/procedures/prep_6_10_upgrade.rb
 - definitions/procedures/pulp/cleanup_old_metadata_files.rb
 - definitions/procedures/pulp/migrate.rb
@@ -365,7 +361,6 @@ files:
 - extras/foreman_protector/foreman-protector.conf
 - extras/foreman_protector/foreman-protector.whitelist
 - extras/foreman_protector/yum/foreman-protector.py
-- extras/passenger-recycler.cron
 - lib/foreman_maintain.rb
 - lib/foreman_maintain/check.rb
 - lib/foreman_maintain/cli.rb

data/bin/passenger-recycler

@@ -1,89 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Trivial Passenger memory monitor and recycler. See the configuration file
-# /etc/passenger-recycler.yaml for options. Execute via SCL.
-#
-require 'yaml'
-
-CONFIG = {}.freeze
-CONFIG_FILE = '/etc/passenger-recycler.yaml'.freeze
-CONFIG = YAML.load_file(CONFIG_FILE) if File.readable?(CONFIG_FILE)
-exit 0 unless CONFIG[:ENABLED]
-
-def running?(pid)
-  Process.getpgid(pid) != -1
-rescue Errno::ESRCH
-  false
-end
-
-def debug(msg)
-  puts(msg) if CONFIG[:DEBUG]
-end
-
-def verbose(msg)
-  puts(msg) if CONFIG[:VERBOSE]
-end
-
-def kill(pid)
-  return unless running?(pid) && CONFIG[:KILL_BUSY]
-  verbose "Process #{pid} is still running, sending SIGKILL"
-  Process.kill 'KILL', pid
-  sleep 5
-end
-
-def process_status?(pid)
-  if running?(pid)
-    verbose "Process #{pid} still terminating, moving on..."
-  else
-    verbose "Process successfully #{pid} terminated"
-  end
-end
-
-def show_passenger_status(status_messages)
-  status_messages.each { |msg| verbose msg }
-end
-
-require 'phusion_passenger'
-PhusionPassenger.locate_directories
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/ruby'
-require 'phusion_passenger/admin_tools/memory_stats'
-stats = PhusionPassenger::AdminTools::MemoryStats.new
-killed = 0
-
-def get_process_start(pid)
-  `ps -p#{pid} -o start=`.strip
-rescue StandardError => e
-  verbose "Error: #{e.message} \nReturning '?'"
-  '?'
-end
-
-def get_rss_info(process)
-  get_pid_mem_kb = process.private_dirty_rss || process.rss
-  get_pid_mem_mb = format('%.0f', get_pid_mem_kb / 1024)
-  [get_pid_mem_kb, get_pid_mem_mb]
-end
-
-stats.passenger_processes.each do |p|
-  pid = p.pid.to_i
-  started = get_process_start(pid)
-  get_pid_mem_kb, get_pid_mem_mb = get_rss_info(p)
-  debug "Checking #{pid} with RSS of #{get_pid_mem_kb}"
-  next unless get_pid_mem_kb > CONFIG[:MAX_PRIV_RSS_MEMORY]
-  status_ps = `ps -p#{pid} -u`
-  status_all = `passenger-status 2> /dev/null`
-  status_backtraces = `passenger-status --show=backtraces 2>/dev/null`
-  verbose("Terminating #{pid} (started #{started}) with private RSS size of #{get_pid_mem_mb} MB")
-  begin
-    Process.kill 'SIGUSR1', pid
-    sleep CONFIG[:GRACEFUL_SHUTDOWN_SLEEP]
-    kill(pid)
-    process_status?(pid)
-    show_passenger_status([status_ps, status_all, status_backtraces]) if CONFIG[:SEND_STATUS]
-    killed += 1
-    exit(1) if killed >= CONFIG[:MAX_TERMINATION]
-  rescue Errno::ESRCH
-    puts "#{Process.pid}: #{pid} is NOT running"
-  end
-end
-exit 0

data/config/passenger-recycler.yaml

@@ -1,38 +0,0 @@
----
-#
-# Trivial Passenger memory monitor. By default it is executed from cron every
-# five minutes and it kills processes exceeding the RSS memory threashold
-# configured with MAX_PRIV_RSS_MEMORY. Up to MAX_TERMINATION processes is
-# terminated during one execution.
-#
-
-# Set to 'false' to completely disable this script.
-:ENABLED: true
-
-# RSS memory threashold to recycle processes (in kB).
-:MAX_PRIV_RSS_MEMORY: 2_000_000
-
-# Controls amount of processes killed during one run. This number should be
-# smaller by one or two than maximum allowed amount of processes by passenger
-# (defaults to 6) so there is at least one process left.
-:MAX_TERMINATION: 1
-
-# Kill processes which do not terminate gracefully using SIGKILL after
-# GRACEFUL_SHUTDOWN_SLEEP period.
-:KILL_BUSY: true
-
-# Amount of seconds to wait for graceful shutdown (SIGTERM) until a process
-# kill (SIGKILL) is sent. Must be lower than 15 minutes (900 seconds). This
-# gives Passenger some extra time for respawning application before another
-# process is terminated.
-:GRACEFUL_SHUTDOWN_SLEEP: 90
-
-# Print 'passenger-status' and 'ps' output before termination to get some extra
-# information via email from cron. Only printed when a kill is performed.
-:SEND_STATUS: true
-
-# Print verbose information "Process terminating" or "Process killed".
-:VERBOSE: true
-
-# Print extra debugging information.
-:DEBUG: false

data/definitions/procedures/passenger_recycler.rb

@@ -1,14 +0,0 @@
-class Procedures::PassengerRecycler < ForemanMaintain::Procedure
-  metadata do
-    description 'Perform Passenger memory recycling'
-
-    confine do
-      execute?('which passenger-recycler')
-    end
-  end
-
-  def run
-    passenger_recycler_path = execute('which passenger-recycler')
-    execute!(passenger_recycler_path)
-  end
-end

data/extras/passenger-recycler.cron

@@ -1,3 +0,0 @@
-# Configuration file /etc/cron.d/passenger-recycler to run passenger-recycler
-# every 15 minutes.
-*/15 * * * * root /usr/bin/passenger-recycler