Skip to content

Commit

Permalink
Aligned numThreads and maxConnections in the reference config and the…
Browse files Browse the repository at this point in the history
… test configs (#178)
  • Loading branch information
WellingR authored and octonato committed Mar 26, 2018
1 parent ad9e5f9 commit e9999ad
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
8 changes: 4 additions & 4 deletions src/main/resources/reference.conf
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jdbc-journal {
numThreads = 20

# 5 * number of threads
maxConnections = 100
maxConnections = 20

# number of threads
minConnections = 20
Expand Down Expand Up @@ -216,7 +216,7 @@ jdbc-snapshot-store {
numThreads = 20

# 5 * number of threads
maxConnections = 100
maxConnections = 20

# number of threads
minConnections = 20
Expand Down Expand Up @@ -350,8 +350,8 @@ jdbc-read-journal {
# 5 * number of cores
numThreads = 20

# 5 * number of threads
maxConnections = 100
# number of threads
maxConnections = 20

# number of threads
minConnections = 20
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/h2-application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include "general.conf"
jdbc-journal {
slick = ${slick}
slick.db.numThreads = 20
slick.db.maxConnections = 100
slick.db.maxConnections = 20
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes

Expand All @@ -39,7 +39,7 @@ jdbc-journal {
jdbc-snapshot-store {
slick = ${slick}
slick.db.numThreads = 20
slick.db.maxConnections = 100
slick.db.maxConnections = 20
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes
}
Expand All @@ -54,7 +54,7 @@ jdbc-read-journal {

slick = ${slick}
slick.db.numThreads = 20
slick.db.maxConnections = 100
slick.db.maxConnections = 20
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/h2-two-read-journals-application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include "general.conf"
jdbc-journal {
slick = ${slick}
slick.db.numThreads = 20
slick.db.maxConnections = 100
slick.db.maxConnections = 20
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes

Expand All @@ -39,7 +39,7 @@ jdbc-journal {
jdbc-snapshot-store {
slick = ${slick}
slick.db.numThreads = 20
slick.db.maxConnections = 100
slick.db.maxConnections = 20
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes
}
Expand All @@ -54,7 +54,7 @@ jdbc-read-journal {

slick = ${slick}
slick.db.numThreads = 20
slick.db.maxConnections = 100
slick.db.maxConnections = 20
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/mysql-application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include "docker.conf"
jdbc-journal {
slick = ${slick}
slick.db.numThreads = 20
slick.db.maxConnections = 100
slick.db.maxConnections = 20
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes

Expand All @@ -41,7 +41,7 @@ jdbc-journal {
jdbc-snapshot-store {
slick = ${slick}
slick.db.numThreads = 20
slick.db.maxConnections = 100
slick.db.maxConnections = 20
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes
}
Expand All @@ -56,7 +56,7 @@ jdbc-read-journal {

slick = ${slick}
slick.db.numThreads = 20
slick.db.maxConnections = 100
slick.db.maxConnections = 20
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/oracle-application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jdbc-journal {

slick = ${slick}
slick.db.numThreads = 20
slick.db.maxConnections = 100
slick.db.maxConnections = 20
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes

Expand Down Expand Up @@ -60,7 +60,7 @@ jdbc-snapshot-store {

slick = ${slick}
slick.db.numThreads = 20
slick.db.maxConnections = 100
slick.db.maxConnections = 20
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes
}
Expand All @@ -83,7 +83,7 @@ jdbc-read-journal {

slick = ${slick}
slick.db.numThreads = 20
slick.db.maxConnections = 100
slick.db.maxConnections = 20
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/postgres-application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include "docker.conf"
jdbc-journal {
slick = ${slick}
slick.db.numThreads = 10
slick.db.maxConnections = 30
slick.db.maxConnections = 10
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes

Expand All @@ -42,7 +42,7 @@ jdbc-journal {
jdbc-snapshot-store {
slick = ${slick}
slick.db.numThreads = 10
slick.db.maxConnections = 30
slick.db.maxConnections = 10
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes
}
Expand All @@ -57,7 +57,7 @@ jdbc-read-journal {

slick = ${slick}
slick.db.numThreads = 10
slick.db.maxConnections = 30
slick.db.maxConnections = 10
slick.db.minConnections = 1
slick.db.connectionTimeout = 1800000 // 30 minutes
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/scala/akka/persistence/jdbc/TablesTestSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ abstract class TablesTestSpec extends FlatSpec with Matchers {
| keepAliveConnection = on // ensures that the database does not get dropped while we are using it
|
| numThreads = 4 // number of cores
| maxConnections = 10 // 2 * numThreads + 1 (if running on an SSD)
| maxConnections = 4 // same as numThreads
| minConnections = 4 // same as numThreads
| }
| }
Expand Down Expand Up @@ -151,7 +151,7 @@ abstract class TablesTestSpec extends FlatSpec with Matchers {
| keepAliveConnection = on // ensures that the database does not get dropped while we are using it
|
| numThreads = 4 // number of cores
| maxConnections = 10 // 2 * numThreads + 1 (if running on an SSD)
| maxConnections = 4 // same as numThreads
| minConnections = 4 // same as numThreads
| }
| }
Expand Down Expand Up @@ -221,7 +221,7 @@ abstract class TablesTestSpec extends FlatSpec with Matchers {
| keepAliveConnection = on // ensures that the database does not get dropped while we are using it
|
| numThreads = 4 // number of cores
| maxConnections = 10 // 2 * numThreads + 1 (if running on an SSD)
| maxConnections = 4 // same as numThreads
| minConnections = 4 // same as numThreads
| }
| }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class AkkaPersistenceConfigTest extends FlatSpec with Matchers {
| keepAliveConnection = on // ensures that the database does not get dropped while we are using it
|
| numThreads = 4 // number of cores
| maxConnections = 10 // 2 * numThreads + 1 (if running on an SSD)
| maxConnections = 4 // same as numThreads
| minConnections = 4 // same as numThreads
| }
| }
Expand Down Expand Up @@ -140,7 +140,7 @@ class AkkaPersistenceConfigTest extends FlatSpec with Matchers {
| keepAliveConnection = on // ensures that the database does not get dropped while we are using it
|
| numThreads = 4 // number of cores
| maxConnections = 10 // 2 * numThreads + 1 (if running on an SSD)
| maxConnections = 4 // same as numThreads
| minConnections = 4 // same as numThreads
| }
| }
Expand Down Expand Up @@ -209,7 +209,7 @@ class AkkaPersistenceConfigTest extends FlatSpec with Matchers {
| keepAliveConnection = on // ensures that the database does not get dropped while we are using it
|
| numThreads = 4 // number of cores
| maxConnections = 10 // 2 * numThreads + 1 (if running on an SSD)
| maxConnections = 4 // same as numThreads
| minConnections = 4 // same as numThreads
| }
| }
Expand Down

0 comments on commit e9999ad

Please sign in to comment.