removed future await and increased akka http timeout limit

build/docker/api/application.conf

@@ -350,6 +350,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
+    request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on

modules/api/src/it/resources/application.conf

@@ -347,6 +347,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
+    request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on

modules/api/src/main/resources/application.conf

@@ -366,6 +366,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
+    request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on

modules/api/src/universal/conf/application.conf

@@ -351,6 +351,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
+    request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on

modules/docs/src/main/mdoc/operator/config-api.md

@@ -990,6 +990,7 @@ dotted-hosts = {
         # The time period within which the TCP binding process must be completed.
         # Set to `infinite` to disable.
         bind-timeout = 5s
+        request-timeout = 60s
       
         # Show verbose error messages back to the client
         verbose-error-messages = on

modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala

@@ -29,10 +29,6 @@ import vinyldns.core.protobuf.{BatchChangeProtobufConversions, SingleChangeType}
 import vinyldns.core.route.Monitored
 import vinyldns.proto.VinylDNSProto
 
-import scala.concurrent.ExecutionContext.Implicits.global
-import scala.concurrent.duration.DurationInt
-import scala.concurrent.{Await, Future}
-
 /**
   * MySqlBatchChangeRepository implements the JDBC queries that support the APIs defined in BatchChangeRepository.scala
   * BatchChange and SingleChange are stored in RDS as two tables.
@@ -185,10 +181,9 @@ class MySqlBatchChangeRepository
             .apply()
           batchMeta.copy(changes = changes)
         }
-
+    monitor("repo.BatchChangeJDBC.updateSingleChanges") {
-    def updateSingleChangeStatus(singleChanges: Seq[SingleChange]): Future[Option[BatchChange]] = {
+      IO {
-      logger.info(s"Updating single change status: ${singleChanges.map(ch => (ch.id, ch.status))}")
+        logger.info(s"Updating single change status: ${singleChanges.map(ch => (ch.id, ch.status))}")
-      Future {
         DB.localTx { implicit s =>
           for {
             headChange <- singleChanges.headOption
@@ -196,12 +191,10 @@ class MySqlBatchChangeRepository
             _ = UPDATE_SINGLE_CHANGE.batchByName(batchParams: _*).apply()
             batchChange <- getBatchFromSingleChangeId(headChange.id)
           } yield batchChange
-        }}}
+        }}
-
-    monitor("repo.BatchChangeJDBC.updateSingleChanges") {
-      IO {Await.result(updateSingleChangeStatus(singleChanges), 50.seconds)}
     }
   }
+
   def getSingleChanges(singleChangeIds: List[String]): IO[List[SingleChange]] =
     if (singleChangeIds.isEmpty) {
       IO.pure(List())

test/api/functional/application.conf

@@ -301,6 +301,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
+    request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on

test/api/integration/application.conf

@@ -359,7 +359,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
-
+    request-timeout = 60s
     # Show verbose error messages back to the client
     verbose-error-messages = on
   }