manageiq-postgres_ha_admin 3.1.3 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b4c03cda17ed0475dbc8fbe5bf68aa11704047da6067bf40e33fc41a1945a9f
-  data.tar.gz: 63db9fd31ea8a59e9a8967afc36d75fe9419c79a7e8f3b75964e47fd0c3cb20c
+  metadata.gz: 56101e65dae001ffb46cd7694fbef68783b68e9a65acf249be6442de3bfe9946
+  data.tar.gz: 7168416de251ecc47a6f18b74ee670aff0e064f856f4977b9ba326251db6908e
 SHA512:
-  metadata.gz: 9d3b92acf8ec4e2266543b610985a5bdd8c4d69d322f92c05dd3dc0d52cb14e536f1abb78c91b2fd0ca337fe045b5f5c3b0af2fb9aec8cfe26746e792e474679
-  data.tar.gz: 03e0ccd79e54f83d6cec84c387aa3eeb547b4a6b8fe59fef03fa704f335447a47ec73da245aef2ad84bc6aacda3bfb0e8fea7e99b6db4834a87732f0b0fd863f
+  metadata.gz: ca051fa5381377b6252a323a3f77befb7f544d155d86a5b749409a58f7af68d6d2d8cb1c248d8bea6ebbeab8f45a57b43bf87deca082f43720642b7b47f505c8
+  data.tar.gz: 4d32d6edb84ff1cdf9d4448fbc1239962c7b24382d31e143b8169f00156947ea6160a5e63b54647c7c94dee0e4d838320f85f1a2434ac736d7dc8019b7187cc9

data/.github/workflows/ci.yaml

@@ -0,0 +1,49 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: '0 0 * * 0'
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+        - '2.5'
+        - '2.6'
+        - '2.7'
+        - '3.0'
+        rails-version:
+        - '6.0'
+        - '6.1'
+    services:
+      postgres:
+        image: manageiq/postgresql:10
+        env:
+          POSTGRESQL_USER: root
+          POSTGRESQL_PASSWORD: smartvm
+          POSTGRESQL_DATABASE: vmdb_test
+        options: --health-cmd pg_isready --health-interval 2s --health-timeout 5s --health-retries 5
+        ports:
+        - 5432:5432
+    env:
+      PGHOST: localhost
+      TEST_RAILS_VERSION: ${{ matrix.rails-version }}
+      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+      timeout-minutes: 30
+    - name: Run tests
+      run: bundle exec rake
+    - 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

data/.rspec

@@ -1,4 +1,3 @@
 --require spec_helper
 --color
 --order random
---format documentation

data/.whitesource

@@ -0,0 +1,3 @@
+{
+  "settingsInheritedFrom": "ManageIQ/whitesource-config@master"
+}

data/CHANGELOG.md

@@ -3,31 +3,48 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [3.1.3] - 2021-09-27
+## [Unreleased]
+
+## [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)
+
+### Changed
+- 5 minute db checks is too long, use 2 minutes [#37](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/37)
+
+### Removed
+- Remove unused pglogical_config_handler [#35](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/35)
+
+### Fixed
+- Don't attempt a database failover without a known standby [#36](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/36)
+
+## [3.1.4] - 2022-04-30
+### Changed
+- Loosen rails dependency to include rails 6.1 [#28](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/28)
 
+## [3.1.3] - 2021-09-27
 ### Changed
 - Loosen manageiq-password dependency to < 2 [#26](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/26)
-- Update ruby versions to 2.5.8 minimum [#25](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/25)
+- Update ruby versions to 2.5.8 minimum and support Ruby 3.0 [#25](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/25)
 - Switch to manageiq-style [#24](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/24)
 
 ## [3.1.2] - 2020-12-21
+### Changed
 - Allow for Rails 6.0 [#23](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/23)
 
 ## [3.1.1] - 2019-12-12
+### Changed
 - Remove the dependency on linux_admin [#19](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/19)
 
 ## [3.1.0] - 2019-05-09
-
 ### Added
 - Add a logical replication config handler [#17](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/17)
 
 ## [3.0.1] - 2019-03-19
-
 ### Changed
 - Remove references to MiqPassword [#15](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/15)
 
 ## [3.0.0] - 2018-09-05
-
 ### Added
 - Allow users of the gem to specify a logger object [#7](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/7)
 
@@ -37,7 +54,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Make failover monitor generic [#10](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/10)
 
 ## [2.0.0] - 2018-08-01
-
 ### Added
 - Add pg-dsn_parser to the gemspec [#5](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/5)
 - Add postgresql addon for travis [#6](https://github.com/ManageIQ/manageiq-postgres_ha_admin/pull/6)
@@ -45,7 +61,10 @@ 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.1.2...master
+[Unreleased]: https://github.com/ManageIQ/manageiq-postgres_ha_admin/compare/v3.2.0...master
+[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
 [3.1.2]: https://github.com/ManageIQ/manageiq-postgres_ha_admin/compare/v3.1.1...v3.1.2
 [3.1.1]: https://github.com/ManageIQ/manageiq-postgres_ha_admin/compare/v3.1.0...v3.1.1
 [3.1.0]: https://github.com/ManageIQ/manageiq-postgres_ha_admin/compare/v3.0.1...v3.1.0

data/CODEOWNERS

@@ -1 +1 @@
-* @carbonin
+* @Fryguy

data/Gemfile

@@ -2,3 +2,10 @@ 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

data/README.md

@@ -1,10 +1,9 @@
 # ManageIQ::PostgresHaAdmin
 
 [![Gem Version](https://badge.fury.io/rb/manageiq-postgres_ha_admin.svg)](http://badge.fury.io/rb/manageiq-postgres_ha_admin)
-[![Build Status](https://travis-ci.org/ManageIQ/manageiq-postgres_ha_admin.svg)](https://travis-ci.org/ManageIQ/manageiq-postgres_ha_admin)
+[![CI](https://github.com/ManageIQ/manageiq-postgres_ha_admin/actions/workflows/ci.yaml/badge.svg)](https://github.com/ManageIQ/manageiq-postgres_ha_admin/actions/workflows/ci.yaml)
 [![Code Climate](https://codeclimate.com/github/ManageIQ/manageiq-postgres_ha_admin.svg)](https://codeclimate.com/github/ManageIQ/manageiq-postgres_ha_admin)
 [![Test Coverage](https://codeclimate.com/github/ManageIQ/manageiq-postgres_ha_admin/badges/coverage.svg)](https://codeclimate.com/github/ManageIQ/manageiq-postgres_ha_admin/coverage)
-[![Security](https://hakiri.io/github/ManageIQ/manageiq-postgres_ha_admin/master.svg)](https://hakiri.io/github/ManageIQ/manageiq-postgres_ha_admin/master)
 
 [![Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ManageIQ/manageiq-postgres_ha_admin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

data/lib/manageiq/postgres_ha_admin/config_handler.rb

@@ -27,9 +27,12 @@ module PostgresHaAdmin
       @before_failover_cb&.call
     end
 
+    # Upon successful failover
     def do_after_failover(new_primary_conn_info)
       @after_failover_cb&.call(new_primary_conn_info)
     end
+
+    # If needed, we can add an unsuccessful failover hook
   end
 end
 end

data/lib/manageiq/postgres_ha_admin/failover_monitor.rb

@@ -7,7 +7,7 @@ module PostgresHaAdmin
     include Logging
 
     FAILOVER_ATTEMPTS = 10
-    DB_CHECK_FREQUENCY = 300
+    DB_CHECK_FREQUENCY = 120
     FAILOVER_CHECK_FREQUENCY = 60
     attr_accessor :failover_attempts, :db_check_frequency, :failover_check_frequency
     attr_reader :config_handlers
@@ -31,17 +31,20 @@ module PostgresHaAdmin
             next
           end
 
-          logger.error("Primary Database is not available for #{handler.name}. Starting to execute failover...")
+          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
-            logger.error("Failover failed")
+            # Add failover_failed hook if we have a use case in the future
+            logger.error("#{log_prefix(__callee__)} Failover failed")
           end
         rescue => e
-          logger.error("Received #{e.class} error while monitoring #{handler.name}: #{e.message}")
+          logger.error("#{log_prefix(__callee__)} Received #{e.class} error while monitoring #{handler.name}: #{e.message}")
           logger.error(e.backtrace)
         end
       end
@@ -52,7 +55,7 @@ module PostgresHaAdmin
         begin
           monitor
         rescue => err
-          logger.error("#{err.class}: #{err}")
+          logger.error("#{log_prefix(__callee__)} #{err.class}: #{err}")
           logger.error(err.backtrace.join("\n"))
         end
         sleep(db_check_frequency)
@@ -72,21 +75,37 @@ module PostgresHaAdmin
       begin
         ha_admin_yml = YAML.load_file(ha_admin_yml_file) if File.exist?(ha_admin_yml_file)
       rescue SystemCallError, IOError => err
-        logger.error("#{err.class}: #{err}")
-        logger.info("File not loaded: #{ha_admin_yml_file}. Default settings for failover will be used.")
+        logger.error("#{log_prefix(__callee__)} #{err.class}: #{err}")
+        logger.info("#{log_prefix(__callee__)} File not loaded: #{ha_admin_yml_file}. Default settings for failover will be used.")
       end
       @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("FAILOVER_ATTEMPTS=#{@failover_attempts} DB_CHECK_FREQUENCY=#{@db_check_frequency} 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}")
+    end
+
+    def any_known_standby?(handler, server_store)
+      current_host = handler.read[:host]
+      server_store.servers.any? do |server|
+        server[:host] != current_host && server[:type] == "standby"
+      end
     end
 
     def execute_failover(handler, server_store)
+      # TODO: Instead of returning false, we should raise:
+      # "No active standby"
+      # "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.")
+        return false
+      end
+
       failover_attempts.times do
         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("Failing over to server using conninfo: #{params.reject { |k, _v| k == :password }}")
+          logger.info("#{log_prefix(__callee__)} Failing over to server using conninfo: #{params.reject { |k, _v| k == :password }}")
           server_store.update_servers(connection)
           handler.write(params)
           return params
@@ -111,7 +130,7 @@ module PostgresHaAdmin
     def pg_connection(params)
       PG::Connection.open(params)
     rescue PG::Error => e
-      logger.error("Failed to establish PG connection: #{e.message}")
+      logger.error("#{log_prefix(__callee__)} Failed to establish PG connection: #{e.message}")
       nil
     end
 

data/lib/manageiq/postgres_ha_admin/logging.rb

@@ -4,6 +4,10 @@ module PostgresHaAdmin
     def logger
       ManageIQ::PostgresHaAdmin.logger
     end
+
+    def log_prefix(method)
+      "(PostgresHaAdmin##{method})"
+    end
   end
 end
 end

data/lib/manageiq/postgres_ha_admin/server_store.rb

@@ -25,11 +25,11 @@ module PostgresHaAdmin
     def update_servers(connection)
       new_servers = query_repmgr(connection)
       if servers_changed?(new_servers)
-        logger.info("Updating servers cache to #{new_servers}")
+        logger.info("#{log_prefix(__callee__)} Updating servers cache to #{new_servers}")
         @servers = new_servers
       end
     rescue IOError => err
-      logger.error("#{err.class}: #{err}")
+      logger.error("#{log_prefix(__callee__)} #{err.class}: #{err}")
       logger.error(err.backtrace.join("\n"))
     end
 
@@ -59,7 +59,7 @@ module PostgresHaAdmin
       db_result.clear
       result
     rescue PG::Error => err
-      logger.error("#{err.class}: #{err}")
+      logger.error("#{log_prefix(__callee__)} #{err.class}: #{err}")
       logger.error(err.backtrace.join("\n"))
       result
     end

data/lib/manageiq/postgres_ha_admin/version.rb

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

data/lib/manageiq-postgres_ha_admin.rb

@@ -8,7 +8,6 @@ require 'manageiq/postgres_ha_admin/failover_monitor'
 
 require 'manageiq/postgres_ha_admin/config_handler'
 require 'manageiq/postgres_ha_admin/config_handler/rails_config_handler'
-require 'manageiq/postgres_ha_admin/config_handler/pglogical_config_handler'
 require 'manageiq/postgres_ha_admin/config_handler/logical_replication_config_handler'
 
 module ManageIQ

data/manageiq-postgres_ha_admin.gemspec

@@ -16,22 +16,26 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
+  spec.metadata    = {
+    "changelog_uri" => "https://github.com/ManageIQ/manageiq-postgres_ha_admin/blob/master/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/ManageIQ/manageiq-postgres_ha_admin/",
+    "bug_tracker_uri" => "https://github.com/ManageIQ/manageiq-postgres_ha_admin/issues"
+  }
   spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.5.8"
 
-  spec.add_runtime_dependency "activesupport",     ">=5.0", "< 6.1"
+  spec.add_runtime_dependency "activesupport",     ">=5.0", "< 7.0"
   spec.add_runtime_dependency "awesome_spawn",     "~> 1.4"
   spec.add_runtime_dependency "manageiq-password", "< 2"
   spec.add_runtime_dependency "pg"
   spec.add_runtime_dependency "pg-dsn_parser",     "~> 0.1"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
   spec.add_development_dependency "manageiq-style"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec",                     "~> 3.0"
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "rspec",     "~> 3.0"
+  spec.add_development_dependency "simplecov", ">= 0.21.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-postgres_ha_admin
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2022-09-26 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: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: awesome_spawn
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +100,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: manageiq-style
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +148,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.2
 description: ManageIQ Postgres H.A. Admin
 email:
 executables: []
@@ -177,13 +163,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rspec_ci"
 - ".rubocop.yml"
 - ".rubocop_cc.yml"
 - ".rubocop_local.yml"
-- ".travis.yml"
+- ".whitesource"
 - CHANGELOG.md
 - CODEOWNERS
 - Gemfile
@@ -193,7 +180,6 @@ files:
 - lib/manageiq-postgres_ha_admin.rb
 - lib/manageiq/postgres_ha_admin/config_handler.rb
 - lib/manageiq/postgres_ha_admin/config_handler/logical_replication_config_handler.rb
-- lib/manageiq/postgres_ha_admin/config_handler/pglogical_config_handler.rb
 - lib/manageiq/postgres_ha_admin/config_handler/rails_config_handler.rb
 - lib/manageiq/postgres_ha_admin/failover_monitor.rb
 - lib/manageiq/postgres_ha_admin/logging.rb
@@ -204,7 +190,10 @@ files:
 homepage: https://github.com/ManageIQ/manageiq-postgres_ha_admin
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/ManageIQ/manageiq-postgres_ha_admin/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/ManageIQ/manageiq-postgres_ha_admin/
+  bug_tracker_uri: https://github.com/ManageIQ/manageiq-postgres_ha_admin/issues
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -220,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.18
 signing_key:
 specification_version: 4
 summary: ManageIQ Postgres H.A. Admin

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-rvm:
-- 2.5.8
-- 2.6.6
-- 2.7.2
-- 3.0.0
-cache: bundler
-env:
-  global:
-  - RUBY_GC_HEAP_GROWTH_MAX_SLOTS=300000
-  - RUBY_GC_HEAP_INIT_SLOTS=600000
-  - RUBY_GC_HEAP_GROWTH_FACTOR=1.25
-addons:
-  postgresql: '10'
-after_script: bundle exec codeclimate-test-reporter

data/lib/manageiq/postgres_ha_admin/config_handler/pglogical_config_handler.rb

@@ -1,36 +0,0 @@
-require 'pg'
-require 'pg/dsn_parser'
-
-module ManageIQ
-module PostgresHaAdmin
-  class PglogicalConfigHandler < ConfigHandler
-    attr_reader :subscription, :conn_info
-
-    def initialize(options = {})
-      @subscription = options[:subscription]
-      @conn_info    = options[:conn_info]
-    end
-
-    def name
-      "pglogical subscription #{subscription} Config Handler"
-    end
-
-    def read
-      conn = PG::Connection.open(@conn_info)
-      dsn = conn.exec_params(<<~SQL, [@subscription]).first["if_dsn"]
-        SELECT if_dsn
-        FROM pglogical.subscription s
-        JOIN pglogical.node_interface i
-          ON s.sub_origin_if = i.if_id
-        WHERE s.sub_name = $1
-      SQL
-      PG::DSNParser.new.parse(dsn)
-    end
-
-    def write(_params)
-      # Nothing to do here as the expectation is that the user will 
-      # remove and re-add the subscription in the after failover callback
-    end
-  end
-end
-end