Use the new config handler for logical replication failover

ManageIQ · May 7, 2019 · 81ddc80 · 81ddc80
1 parent ea9167b
commit 81ddc80
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -50,7 +50,7 @@ gem "log_decorator",                  "~>0.1",         :require => false
 gem "manageiq-api-client",            "~>0.3.3",       :require => false
 gem "manageiq-messaging",             "~>0.1.4",       :require => false
 gem "manageiq-password",              "~>0.3",         :require => false
-gem "manageiq-postgres_ha_admin",     "~>3.0",         :require => false
+gem "manageiq-postgres_ha_admin",     "~>3.0",         :git => "https://github.com/carbonin/manageiq-postgres_ha_admin.git", :branch => "add_logical_replication_config_handler", :require => false
 gem "memoist",                        "~>0.15.0",      :require => false
 gem "mime-types",                     "~>3.0",         :path => File.expand_path("mime-types-redirector", __dir__)
 gem "more_core_extensions",           "~>3.7"

diff --git a/lib/evm_database.rb b/lib/evm_database.rb
@@ -147,7 +147,7 @@ def self.run_failover_monitor(monitor = nil)
     monitor ||= ManageIQ::PostgresHaAdmin::FailoverMonitor.new(Rails.root.join("config", "ha_admin.yml"))
 
     configure_rails_handler(monitor)
-    configure_pglogical_handlers(monitor)
+    configure_logical_replication_handlers(monitor)
 
     _log.info("Starting database failover monitor")
     monitor.monitor_loop
@@ -177,12 +177,12 @@ def self.configure_rails_handler(monitor)
   end
   private_class_method :configure_rails_handler
 
-  def self.configure_pglogical_handlers(monitor)
+  def self.configure_logical_replication_handlers(monitor)
     return unless MiqServer.my_server.has_active_role?("database_operations")
 
     local_db_conninfo = ActiveRecord::Base.connection.raw_connection.conninfo_hash.delete_blanks
     PglogicalSubscription.all.each do |s|
-      handler = ManageIQ::PostgresHaAdmin::PglogicalConfigHandler.new(:subscription => s.id, :conn_info => local_db_conninfo)
+      handler = ManageIQ::PostgresHaAdmin::LogicalReplicationConfigHandler.new(:subscription => s.id, :conn_info => local_db_conninfo)
       _log.info("Configuring database failover for replication subscription #{s.id} ")
 
       handler.after_failover do |new_conn_info|
@@ -193,5 +193,5 @@ def self.configure_pglogical_handlers(monitor)
       monitor.add_handler(handler)
     end
   end
-  private_class_method :configure_pglogical_handlers
+  private_class_method :configure_logical_replication_handlers
 end