Merge pull request #1235 from ctti-clinicaltrials/improve-public-db-connection-logic

Improve public db connection logic

Author: akabishau

app/models/util/db_manager.rb

@@ -19,10 +19,32 @@ def initialize(params={})
     ##### connection management #####
 
     def public_connection
-      connection = PublicBase.connection
-      connection.schema_search_path = @schema
-      # puts "public connection: #{connection.schema_search_path}"
-      connection
+      max_attempts = 3
+      attempt = 0
+      backoff_time = 20
+      
+      begin
+        attempt += 1
+        connection = PublicBase.connection
+        connection.schema_search_path = @schema
+        connection.execute("SELECT 1")
+        return connection
+      rescue PG::ConnectionBad, ActiveRecord::StatementInvalid => e
+        if attempt < max_attempts
+          log("Public database connection error: #{e.message}. Retrying in #{backoff_time}s (#{attempt}/#{max_attempts})")
+          
+          PublicBase.connection_pool.disconnect! # Force reconnection
+          sleep(backoff_time)
+          
+          backoff_time *= 2 # Exponential backoff
+          retry
+        else
+          msg = "Failed to establish public database connection after #{max_attempts} attempts: #{e.message}"
+          log(msg)
+          event&.add_problem("#{Time.zone.now}: #{msg}")
+          raise e
+        end
+      end
     end
 
     def staging_connection
@@ -171,6 +193,10 @@ def restore_from_url(params = {})
     # 2. if successful restore to public db
     def refresh_public_db
       restore_database(public_connection, fm.pg_dump_file)
+    rescue => e
+      error_msg = "Failed to refresh public database: #{e.message}"
+      log(error_msg)
+      event&.add_problem("#{Time.zone.now}: #{error_msg}")
     end
 
     def run_command_line(cmd)

app/models/util/updater_v2.rb

@@ -65,8 +65,11 @@ def worker
     end
 
     def db_mgr
-      # makes it "singleton-like" inside the class
-      @db_mgr ||= Util::DbManager.new(event: @load_event, schema: @schema)
+      if @db_mgr.nil?
+        @db_mgr = Util::DbManager.new(event: @load_event, schema: @schema)
+      else
+        @db_mgr.event = @load_event # always has acccess to the latest event
+      end
     end
 
     def update_current_studies