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

fix contract_tpid_fkey-related race condition #11330

Merged
merged 8 commits into from
Oct 22, 2021
Merged

fix contract_tpid_fkey-related race condition #11330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d858aa4
trying to reliably reproduce the template ID constraint error
S11001001 Oct 20, 2021
4633c31
tentative fix for template ID constraint error
S11001001 Oct 20, 2021
a725fc4
sequential simulation
S11001001 Oct 21, 2021
63c3820
successfully reproduce the error pre-4633c3137a
S11001001 Oct 21, 2021
dbd379b
also reproduced the error pre-4633c3137a on Oracle
S11001001 Oct 21, 2021
fae8ad2
add changelog
S11001001 Oct 21, 2021
b2aab2c
clean up some now-unneeded printlns
S11001001 Oct 21, 2021
c5403f7
Merge commit 'e6da1f7b52ea680ea152871728f5210ae03337c2' into invalid-…
S11001001 Oct 21, 2021
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
5 changes: 4 additions & 1 deletion ledger-service/db-backend/src/main/scala/com/digitalasset/http/dbbackend/Queries.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,10 @@ sealed abstract class Queries(tablePrefix: String, tpIdCacheMaxEntries: Long)(im
Applicative[ConnectionIO].pure(tpId)
}
.getOrElse {
surrogateTemplateIdFromDb(packageId, moduleName, entityName).map { tpId =>
for {
tpId <- surrogateTemplateIdFromDb(packageId, moduleName, entityName)
_ <- connection.commit
} yield {
surrogateTpIdCache.setCacheValue(packageId, moduleName, entityName, tpId)
tpId
}
Expand Down
82 changes: 64 additions & 18 deletions ledger-service/http-json/src/itlib/scala/http/AbstractDatabaseIntegrationTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ import com.daml.http.util.Logging.{InstanceUUID, instanceUUIDLogCtx}
import com.daml.logging.LoggingContextOf
import com.daml.metrics.Metrics
import doobie.util.log.LogHandler
import doobie.free.{connection => fconn}
import org.scalatest.freespec.AsyncFreeSpecLike
import org.scalatest.{Assertion, AsyncTestSuite, BeforeAndAfterAll, Inside}
import org.scalatest.matchers.should.Matchers
import scalaz.std.list._

import scala.collection.compat._
import scala.concurrent.Future
Expand Down Expand Up @@ -184,25 +186,69 @@ abstract class AbstractDatabaseIntegrationTest extends AsyncFreeSpecLike with Be
} yield succeed
}.unsafeToFuture()

"SurrogateTemplateIdCache should be used on template insertion and reads" in {
import dao.jdbcDriver.q.queries
def getOrElseInsertTemplate(tpid: TemplateId[String])(implicit
logHandler: LogHandler = dao.logHandler
) = instanceUUIDLogCtx(implicit lc =>
dao.transact(
queries
.surrogateTemplateId(tpid.packageId, tpid.moduleName, tpid.entityName)
"SurrogateTemplateIdCache" - {
"should be used on template insertion and reads" in {
import dao.jdbcDriver.q.queries
def getOrElseInsertTemplate(tpid: TemplateId[String])(implicit
logHandler: LogHandler = dao.logHandler
) = instanceUUIDLogCtx(implicit lc =>
dao.transact(
queries
.surrogateTemplateId(tpid.packageId, tpid.moduleName, tpid.entityName)
)
)
)
val tpId = TemplateId("pkg", "mod", "ent")
for {
storedStpId <- getOrElseInsertTemplate(tpId) //insert the template id into the cache
cachedStpId <- getOrElseInsertTemplate(tpId) // should trigger a read from cache
} yield {
storedStpId shouldEqual cachedStpId
queries.surrogateTpIdCache.getHitCount shouldBe 1
queries.surrogateTpIdCache.getMissCount shouldBe 1

val tpId = TemplateId("pkg", "mod", "ent")
for {
storedStpId <- getOrElseInsertTemplate(tpId) //insert the template id into the cache
cachedStpId <- getOrElseInsertTemplate(tpId) // should trigger a read from cache
} yield {
storedStpId shouldEqual cachedStpId
queries.surrogateTpIdCache.getHitCount shouldBe 1
queries.surrogateTpIdCache.getMissCount shouldBe 1
}
}.unsafeToFuture()

"doesn't cache uncommitted template IDs" in {
import dbbackend.Queries.DBContract, spray.json.{JsObject, JsNull, JsValue},
spray.json.DefaultJsonProtocol._
import dao.logHandler, dao.jdbcDriver.q.queries

val tpId = TemplateId("pkg", "mod", "UncomCollision")

val simulation = instanceUUIDLogCtx { implicit lc =>
def stid =
queries.surrogateTemplateId(tpId.packageId, tpId.moduleName, tpId.entityName)

for {
_ <- queries.dropAllTablesIfExist
_ <- queries.initDatabase
_ <- fconn.commit
_ <- stid
_ <- fconn.rollback // as with when we conflict and retry
tpid <- stid
_ <- queries.insertContracts(
List(
DBContract(
contractId = "foo",
templateId = tpid,
key = JsNull: JsValue,
keyHash = None,
payload = JsObject(): JsValue,
signatories = Seq("Alice"),
observers = Seq.empty,
agreementText = "",
)
)
)
_ <- fconn.commit
} yield succeed
}

dao
.transact(simulation)
.unsafeToFuture()
}
}.unsafeToFuture()
}

}