Move logic for dropping pglogical extension to a separate method

https://bugzilla.redhat.com/show_bug.cgi?id=1445803 https://bugzilla.redhat.com/show_bug.cgi?id=1444993 (transferred from ManageIQ/manageiq-gems-pending@d8263c8)
ManageIQ · Mar 16, 2021 · ef6e1a3 · ef6e1a3
1 parent 98701fb
commit ef6e1a3
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/manageiq/appliance_console/postgres_admin.rb b/lib/manageiq/appliance_console/postgres_admin.rb
@@ -111,18 +111,24 @@ def self.restore(opts)
   end
 
   def self.before_restore(opts)
+    # Drop subscriptions, unload extension and ensure pglogical connections are closed before proceeding
+    unload_pglogical_extension(opts)
+  rescue AwesomeSpawn::CommandResultError
+    $log.info("MIQ(#{name}.#{__method__}) Ignoring failure to remove pglogical before restore ...")
+  end
+
+  def self.unload_pglogical_extension(opts)
     runcmd("psql", opts, :command => <<-SQL)
       SELECT
         drop_subscription
       FROM
         pglogical.subscription subs,
         LATERAL pglogical.drop_subscription(subs.sub_name)
     SQL
+
     runcmd("psql", opts, :command => <<-SQL)
       DROP EXTENSION pglogical CASCADE
     SQL
-  rescue AwesomeSpawn::CommandResultError
-    $log.info("MIQ(#{name}.#{__method__}) Ignoring failure to remove pglogical before restore ...")
   end
 
   def self.backup_compress_with_gzip