Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce Postgres transaction isolation level #1860

Merged
merged 1 commit into from
Jul 8, 2021
Merged

Reduce Postgres transaction isolation level #1860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eclair-core/src/main/scala/fr/acinq/eclair/db/pg/PgUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ object PgUtils extends JdbcUtils {

def inTransaction[T](f: Connection => T)(implicit dataSource: DataSource): T = {
withConnection { connection =>
inTransactionInternal(IsolationLevel.TRANSACTION_SERIALIZABLE)(connection)(f)
inTransactionInternal(IsolationLevel.TRANSACTION_READ_COMMITTED)(connection)(f)
}
}

Expand Down
42 changes: 37 additions & 5 deletions eclair-core/src/test/scala/fr/acinq/eclair/db/PgUtilsSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ package fr.acinq.eclair.db

import com.opentable.db.postgres.embedded.EmbeddedPostgres
import com.typesafe.config.{Config, ConfigFactory}
import fr.acinq.eclair.db.pg.PgUtils.{JdbcUrlChanged, migrateTable, using}
import fr.acinq.eclair.db.pg.PgUtils.ExtendedResultSet._
import fr.acinq.eclair.db.pg.PgUtils.PgLock.{LockFailure, LockFailureHandler}
import fr.acinq.eclair.db.pg.PgUtils.{JdbcUrlChanged, migrateTable, using}
import fr.acinq.eclair.{TestKitBaseClass, TestUtils}
import grizzled.slf4j.Logging
import org.postgresql.PGConnection
import org.postgresql.jdbc.PgConnection
import grizzled.slf4j.{Logger, Logging}
import org.postgresql.jdbc.PgConnection
import org.postgresql.util.PGInterval
import org.scalatest.concurrent.Eventually
import org.scalatest.funsuite.AnyFunSuiteLike
import fr.acinq.eclair.db.pg.PgUtils.ExtendedResultSet._

import java.io.File
import java.util.UUID
import javax.sql.DataSource

class PgUtilsSpec extends TestKitBaseClass with AnyFunSuiteLike with Eventually {

Expand Down Expand Up @@ -67,6 +67,38 @@ class PgUtilsSpec extends TestKitBaseClass with AnyFunSuiteLike with Eventually
pg.close()
}

test("withLock utility method") {
val pg = EmbeddedPostgres.start()
val config = PgUtilsSpec.testConfig(pg.getPort)
val datadir = new File(TestUtils.BUILD_DIRECTORY, s"pg_test_${UUID.randomUUID()}")
datadir.mkdirs()
val instanceId1 = UUID.randomUUID()
// this will lock the database for this instance id
val db = Databases.postgres(config, instanceId1, datadir, LockFailureHandler.logAndThrow)
implicit val ds: DataSource = db.dataSource

// dummy query works
db.lock.withLock { conn =>
conn.createStatement().executeQuery("SELECT 1")
}

intercept[LockFailureHandler.LockException] {
db.lock.withLock { conn =>
// we start with a dummy query
conn.createStatement().executeQuery("SELECT 1")
// but before we complete the query, a separate connection takes the lock
using(pg.getPostgresDatabase.getConnection.prepareStatement(s"UPDATE lease SET expires_at = now() + ?, instance = ? WHERE id = 1")) {
statement =>
statement.setObject(1, new PGInterval("60 seconds"))
statement.setString(2, UUID.randomUUID().toString)
statement.executeUpdate()
}
}
}

pg.close()
}

test("jdbc url check") {
val pg = EmbeddedPostgres.start()
val config = PgUtilsSpec.testConfig(pg.getPort)
Expand Down