Skip to content

Commit 00f2354

Browse files
committed
Extend connection timeout to the DB server for DB2IntegrationSuite and its variants.
1 parent dfa3978 commit 00f2354

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import java.math.BigDecimal
2121
import java.sql.{Connection, Date, Timestamp}
2222
import java.util.Properties
2323

24+
import org.scalatest.time.SpanSugar._
25+
2426
import org.apache.spark.sql.Row
2527
import org.apache.spark.sql.types.{BooleanType, ByteType, ShortType, StructType}
2628
import org.apache.spark.tags.DockerTest
@@ -51,6 +53,8 @@ class DB2IntegrationSuite extends DockerJDBCIntegrationSuite {
5153
s"jdbc:db2://$ip:$port/foo:user=db2inst1;password=rootpass;retrieveMessagesFromServerOnGetMessage=true;" //scalastyle:ignore
5254
}
5355

56+
override val connectionTimeout = timeout(5.minutes)
57+
5458
override def dataPreparation(conn: Connection): Unit = {
5559
conn.prepareStatement("CREATE TABLE tbl (x INTEGER, y VARCHAR(8))").executeUpdate()
5660
conn.prepareStatement("INSERT INTO tbl VALUES (42,'fred')").executeUpdate()

external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2KrbIntegrationSuite.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import javax.security.auth.login.Configuration
2424
import com.spotify.docker.client.messages.{ContainerConfig, HostConfig}
2525
import org.apache.hadoop.security.{SecurityUtil, UserGroupInformation}
2626
import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod.KERBEROS
27+
import org.scalatest.time.SpanSugar._
2728

2829
import org.apache.spark.sql.execution.datasources.jdbc.JDBCOptions
2930
import org.apache.spark.sql.execution.datasources.jdbc.connection.{DB2ConnectionProvider, SecureConnectionProvider}
@@ -76,6 +77,8 @@ class DB2KrbIntegrationSuite extends DockerKrbJDBCIntegrationSuite {
7677
}
7778
}
7879

80+
override val connectionTimeout = timeout(5.minutes)
81+
7982
override protected def setAuthentication(keytabFile: String, principal: String): Unit = {
8083
val config = new SecureConnectionProvider.JDBCConfiguration(
8184
Configuration.getConfiguration, "JaasClient", keytabFile, principal)

external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/DB2IntegrationSuite.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ package org.apache.spark.sql.jdbc.v2
1919

2020
import java.sql.Connection
2121

22+
import org.scalatest.time.SpanSugar._
23+
2224
import org.apache.spark.SparkConf
2325
import org.apache.spark.sql.AnalysisException
2426
import org.apache.spark.sql.execution.datasources.v2.jdbc.JDBCTableCatalog
@@ -52,6 +54,8 @@ class DB2IntegrationSuite extends DockerJDBCIntegrationSuite with V2JDBCTest {
5254
s"jdbc:db2://$ip:$port/foo:user=db2inst1;password=rootpass;retrieveMessagesFromServerOnGetMessage=true;" //scalastyle:ignore
5355
}
5456

57+
override val connectionTimeout = timeout(5.minutes)
58+
5559
override def sparkConf: SparkConf = super.sparkConf
5660
.set("spark.sql.catalog.db2", classOf[JDBCTableCatalog].getName)
5761
.set("spark.sql.catalog.db2.url", db.getJdbcUrl(dockerIp, externalPort))

0 commit comments

Comments
 (0)