manageiq-postgres_ha_admin 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56101e65dae001ffb46cd7694fbef68783b68e9a65acf249be6442de3bfe9946
-  data.tar.gz: 7168416de251ecc47a6f18b74ee670aff0e064f856f4977b9ba326251db6908e
+  metadata.gz: 6f7b943098fa2b607f670d3505cc3aa1996eb66bd592466083256bd73a74c850
+  data.tar.gz: 39a22f1501b7174790e419aec205d8ccf2197d15cf075c5b4080b88f36ab2fe4
 SHA512:
-  metadata.gz: ca051fa5381377b6252a323a3f77befb7f544d155d86a5b749409a58f7af68d6d2d8cb1c248d8bea6ebbeab8f45a57b43bf87deca082f43720642b7b47f505c8
-  data.tar.gz: 4d32d6edb84ff1cdf9d4448fbc1239962c7b24382d31e143b8169f00156947ea6160a5e63b54647c7c94dee0e4d838320f85f1a2434ac736d7dc8019b7187cc9
+  metadata.gz: 73d0bce84c88772e4eff29c11439bb76de2a957cfebe16e2318f9f5ea99ea215fb741aec241a7f81b3a83acfff469a7fd366a9da648f561785e4b015d866872b
+  data.tar.gz: 7bf2436cc0d06dbd2a28a0b25a02d250fe0b922ffcb9003e00916e3308cb6201979321d9d71fc517eb1f89837155d33dd3f50bdb0d61ee9aceec1af2173d0780

data/.codeclimate.yml

@@ -12,7 +12,7 @@ plugins:
   rubocop:
     enabled: true
     config: ".rubocop_cc.yml"
-    channel: rubocop-0-82
+    channel: rubocop-1-56-3
   brakeman:
     enabled: false
   bundler-audit:

data/.github/workflows/ci.yaml

@@ -12,16 +12,16 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-        - '2.5'
-        - '2.6'
         - '2.7'
         - '3.0'
+        - '3.1'
         rails-version:
         - '6.0'
         - '6.1'
+        - '7.0'
     services:
       postgres:
-        image: manageiq/postgresql:10
+        image: manageiq/postgresql:13
         env:
           POSTGRESQL_USER: root
           POSTGRESQL_PASSWORD: smartvm
@@ -34,7 +34,7 @@ jobs:
       TEST_RAILS_VERSION: ${{ matrix.rails-version }}
       CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -46,4 +46,4 @@ jobs:
     - name: Report code coverage
       if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.0' && matrix.rails-version == '6.1' }}
       continue-on-error: true
-      uses: paambaati/codeclimate-action@v3.0.0
+      uses: paambaati/codeclimate-action@v6

data/CHANGELOG.md

@@ -5,6 +5,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [3.3.0] - 2024-05-14
+### Added
+- Rails 7 support [#43](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/43)
+
+## [3.2.1] - 2023-03-22
+### Changed
+- Improve failover logging [#39](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/39)
+
 ## [3.2.0] - 2022-09-26
 ### Added
 - Add simple prefix to all log lines [#38](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/38)
@@ -61,7 +69,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Make changes for upgrading repmgr to version 4 [#4](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/4)
 
-[Unreleased]: https://github.com/ManageIQ/manageiq-postgres_ha_admin/compare/v3.2.0...master
+[Unreleased]: https://github.com/ManageIQ/manageiq-postgres_ha_admin/compare/v3.3.0...master
+[3.3.0]: https://github.com/ManageIQ/manageiq-postgres_ha_admin/compare/v3.2.1...v3.3.0
+[3.2.1]: https://github.com/ManageIQ/manageiq-postgres_ha_admin/compare/v3.2.0...v3.2.1
 [3.2.0]: https://github.com/ManageIQ/manageiq-postgres_ha_admin/compare/v3.1.4...v3.2.0
 [3.1.4]: https://github.com/ManageIQ/manageiq-postgres_ha_admin/compare/v3.1.3...v3.1.4
 [3.1.3]: https://github.com/ManageIQ/manageiq-postgres_ha_admin/compare/v3.1.2...v3.1.3

data/Gemfile

@@ -3,9 +3,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in manageiq-postgres_ha_admin.gemspec
 gemspec
 
-case ENV['TEST_RAILS_VERSION']
-when "6.0"
-  gem "activesupport", "~>6.0.4"
-when "6.1"
-  gem "activesupport", "~>6.1.4"
-end
+minimum_version =
+  case ENV['TEST_RAILS_VERSION']
+  when "6.0"
+    "~>6.0.4"
+  when "7.0"
+    "~>7.0.8"
+  else
+    "~>6.1.4"
+  end
+
+gem "activesupport", minimum_version

data/lib/manageiq/postgres_ha_admin/failover_monitor.rb

@@ -26,23 +26,20 @@ module PostgresHaAdmin
         begin
           connection = pg_connection(handler.read)
           if connection
-            server_store.update_servers(connection)
+            server_store.update_servers(connection, handler.name)
             connection.finish
             next
           end
 
+          log_settings
+          server_store.log_current_server_store(handler.name)
           logger.error("#{log_prefix(__callee__)} Primary Database is not available for #{handler.name}. Starting to execute failover...")
           handler.do_before_failover
 
           new_conn_info = execute_failover(handler, server_store)
 
-          if new_conn_info
-            # Upon success, we pass a connection hash
-            handler.do_after_failover(new_conn_info)
-          else
-            # Add failover_failed hook if we have a use case in the future
-            logger.error("#{log_prefix(__callee__)} Failover failed")
-          end
+          # Upon success, we pass a connection hash
+          handler.do_after_failover(new_conn_info) if new_conn_info
         rescue => e
           logger.error("#{log_prefix(__callee__)} Received #{e.class} error while monitoring #{handler.name}: #{e.message}")
           logger.error(e.backtrace)
@@ -70,6 +67,10 @@ module PostgresHaAdmin
 
     private
 
+    def log_settings
+      logger.info("#{log_prefix(__callee__)} Current HA settings: FAILOVER_ATTEMPTS=#{@failover_attempts} DB_CHECK_FREQUENCY=#{@db_check_frequency} FAILOVER_CHECK_FREQUENCY=#{@failover_check_frequency}")
+    end
+
     def initialize_settings(ha_admin_yml_file)
       ha_admin_yml = {}
       begin
@@ -81,7 +82,7 @@ module PostgresHaAdmin
       @failover_attempts = ha_admin_yml['failover_attempts'] || FAILOVER_ATTEMPTS
       @db_check_frequency = ha_admin_yml['db_check_frequency'] || DB_CHECK_FREQUENCY
       @failover_check_frequency = ha_admin_yml['failover_check_frequency'] || FAILOVER_CHECK_FREQUENCY
-      logger.info("#{log_prefix(__callee__)} FAILOVER_ATTEMPTS=#{@failover_attempts} DB_CHECK_FREQUENCY=#{@db_check_frequency} FAILOVER_CHECK_FREQUENCY=#{@failover_check_frequency}")
+      log_settings
     end
 
     def any_known_standby?(handler, server_store)
@@ -97,7 +98,7 @@ module PostgresHaAdmin
       # "Standby in recovery"
       # "Exhausted all failover retry attempts" exceptions
       unless any_known_standby?(handler, server_store)
-        logger.error("#{log_prefix(__callee__)} Cannot attempt failover without a known active standby.  Please verify the database.yml and ensure the database is started.")
+        logger.error("#{log_prefix(__callee__)} Cannot attempt failover without a known active standby for #{handler.name}.  Please verify the database.yml and ensure the database is started.")
         return false
       end
 
@@ -105,18 +106,20 @@ module PostgresHaAdmin
         with_each_standby_connection(handler, server_store) do |connection, params|
           next if database_in_recovery?(connection)
           next unless server_store.host_is_primary?(params[:host], connection)
-          logger.info("#{log_prefix(__callee__)} Failing over to server using conninfo: #{params.reject { |k, _v| k == :password }}")
-          server_store.update_servers(connection)
+          logger.info("#{log_prefix(__callee__)} Failing over for #{handler.name} to server using conninfo: #{server_store.sanitized_connection_parameters(params)}")
+          server_store.update_servers(connection, handler.name)
           handler.write(params)
           return params
         end
         sleep(failover_check_frequency)
       end
+      logger.error("#{log_prefix(__callee__)} Failover failed for #{handler.name}")
       false
     end
 
     def with_each_standby_connection(handler, server_store)
       active_servers_conninfo(handler, server_store).each do |params|
+        logger.info("#{log_prefix(__callee__)} Checking active server for #{handler.name} using conninfo: #{server_store.sanitized_connection_parameters(params)}")
         connection = pg_connection(params)
         next if connection.nil?
         begin

data/lib/manageiq/postgres_ha_admin/server_store.rb

@@ -22,10 +22,11 @@ module PostgresHaAdmin
       end
     end
 
-    def update_servers(connection)
+    def update_servers(connection, handler_name = "unspecified handler")
       new_servers = query_repmgr(connection)
       if servers_changed?(new_servers)
-        logger.info("#{log_prefix(__callee__)} Updating servers cache to #{new_servers}")
+        log_current_server_store(handler_name)
+        logger.info("#{log_prefix(__callee__)} Updating servers cache to #{sanitized_servers_array(new_servers)} for #{handler_name}")
         @servers = new_servers
       end
     rescue IOError => err
@@ -42,6 +43,18 @@ module PostgresHaAdmin
       false
     end
 
+    def log_current_server_store(handler_name)
+      logger.info("#{log_prefix(__callee__)} Current servers cache: #{sanitized_servers_array(@servers)} for #{handler_name}")
+    end
+
+    def sanitized_servers_array(server_array)
+      server_array.collect { |p| sanitized_connection_parameters(p) }
+    end
+
+    def sanitized_connection_parameters(params)
+      params.reject { |k, _v| k.to_s == "password" }
+    end
+
     private
 
     def servers_changed?(new_servers)

data/lib/manageiq/postgres_ha_admin/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module PostgresHaAdmin
-    VERSION = '3.2.0'.freeze
+    VERSION = '3.3.0'.freeze
   end
 end

data/manageiq-postgres_ha_admin.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.5.8"
 
-  spec.add_runtime_dependency "activesupport",     ">=5.0", "< 7.0"
+  spec.add_runtime_dependency "activesupport",     ">=5.0", "<7.1"
   spec.add_runtime_dependency "awesome_spawn",     "~> 1.4"
   spec.add_runtime_dependency "manageiq-password", "< 2"
   spec.add_runtime_dependency "pg"

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-postgres_ha_admin
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: awesome_spawn
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +187,7 @@ files:
 - lib/manageiq/postgres_ha_admin/server_store.rb
 - lib/manageiq/postgres_ha_admin/version.rb
 - manageiq-postgres_ha_admin.gemspec
+- renovate.json
 homepage: https://github.com/ManageIQ/manageiq-postgres_ha_admin
 licenses:
 - Apache-2.0
@@ -209,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.18
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: ManageIQ Postgres H.A. Admin