Merge pull request #28238 from code-dot-org/increase-query-timeout-in…

…-contactrollups

Increase query timeout in Contact Rollups multi-statement connection

lib/cdo/contact_rollups.rb

@@ -46,6 +46,16 @@ class ContactRollups
     query_timeout: MAX_EXECUTION_TIME_SEC
   )
 
+  def self.mysql_multi_connection
+    # return a connection with the MULTI_STATEMENTS flag set that allows multiple statements in one DB call
+    sequel_connect(
+      CDO.pegasus_reporting_db_writer,
+      CDO.pegasus_reporting_db_writer,
+      query_timeout: MAX_EXECUTION_TIME_SEC,
+      multi_statements: true
+    )
+  end
+
   # Columns to disregard
   EXCLUDED_COLUMNS = %w(id pardot_id pardot_sync_at updated_at).freeze
 
@@ -680,11 +690,6 @@ def self.update_professional_learning_attendance_for_course_from_sections(course
     WHERE #{DEST_TABLE_NAME}.email = src.email"
   end
 
-  def self.mysql_multi_connection
-    # return a connection with the MULTI_STATEMENTS flag set that allows multiple statements in one DB call
-    Sequel.connect(CDO.pegasus_reporting_db_writer.sub('mysql:', 'mysql2:'), flags: ::Mysql2::Client::MULTI_STATEMENTS)
-  end
-
   # Extracts and formats address data from form data
   # @param form_data [Hash] data from a form
   # @return [Hash] hash of extracted address data. Note it may be empty if no address fields were found.

lib/cdo/db.rb

@@ -10,7 +10,7 @@
 # @param validation_frequency [number] How often to validate the connection. If set to -1,
 #   validate each time a request is made.
 # @param query_timeout [number] The execution timeout for SELECT statements, in seconds.
-def sequel_connect(writer, reader, validation_frequency: nil, query_timeout: nil)
+def sequel_connect(writer, reader, validation_frequency: nil, query_timeout: nil, multi_statements: false)
   reader = reader.gsub 'mysql:', 'mysql2:'
   writer = writer.gsub 'mysql:', 'mysql2:'
 
@@ -62,6 +62,11 @@ def sequel_connect(writer, reader, validation_frequency: nil, query_timeout: nil
     db_options[:init_command] = "SET SESSION MAX_EXECUTION_TIME = #{query_timeout * 1000}"
   end
 
+  if multi_statements
+    # Configure connection with the MULTI_STATEMENTS flag set that allows multiple statements in one database call.
+    db_options[:flags] = ::Mysql2::Client::MULTI_STATEMENTS
+  end
+
   if (reader_uri = URI(reader)).host != URI(writer).host
     db_options[:servers] = {read_only: {host: reader_uri.host}}
   end