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

Changes from 1 commit
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
Prev Previous commit
Next Next commit
sequential simulation
  • Loading branch information
@S11001001
S11001001 committed Oct 21, 2021
commit a725fc430c3049a76a0df30d29beeedb51c3e8fc
39 changes: 16 additions & 23 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 @@ -18,11 +18,8 @@ import org.scalatest.{Assertion, AsyncTestSuite, BeforeAndAfterAll, Inside}
import org.scalatest.matchers.should.Matchers
import scalaz.std.list._

import java.util.concurrent.CyclicBarrier
import java.util.concurrent.TimeUnit.SECONDS
import scala.collection.compat._
import scala.concurrent.Future
import scala.util.Try

abstract class AbstractDatabaseIntegrationTest extends AsyncFreeSpecLike with BeforeAndAfterAll {
this: AsyncTestSuite with Matchers with Inside =>
Expand Down Expand Up @@ -215,24 +212,28 @@ abstract class AbstractDatabaseIntegrationTest extends AsyncFreeSpecLike with Be
"doesn't cache uncommitted template IDs" in {
import dbbackend.Queries.DBContract, spray.json.{JsObject, JsNull, JsValue},
spray.json.DefaultJsonProtocol._
import cats.syntax.apply._
import dao.logHandler, dao.jdbcDriver.q.queries,
queries.{insertContracts, surrogateTemplateId}

val tpId = TemplateId("pkg", "mod", "UncomCollision")
val barrier = new CyclicBarrier(2)
def waitForBarrier() = fconn.async[Int] { k =>
k(Try(barrier.await(5, SECONDS)).toEither)
}

def anUpdateThread(cid: String, first: Boolean) = instanceUUIDLogCtx { implicit lc =>
def stid = surrogateTemplateId(tpId.packageId, tpId.moduleName, tpId.entityName)
val simulation = instanceUUIDLogCtx { implicit lc =>
def stid = {
println(s"s11 starting stid")
surrogateTemplateId(tpId.packageId, tpId.moduleName, tpId.entityName)
.map { i => println(s"s11 completed stid"); i }
}

for {
tpid <- if (first) stid <* waitForBarrier() else waitForBarrier().flatMap(_ => stid)
_ <- queries.dropAllTablesIfExist
_ <- queries.initDatabase
_ <- stid
_ <- fconn.rollback // as with when we conflict and retry
tpid <- stid
_ <- insertContracts(
List(
DBContract(
contractId = cid,
contractId = "foo",
templateId = tpid,
key = JsNull: JsValue,
keyHash = None,
Expand All @@ -243,21 +244,13 @@ abstract class AbstractDatabaseIntegrationTest extends AsyncFreeSpecLike with Be
)
)
)
_ <- if (first) waitForBarrier() *> fconn.commit else fconn.commit <* waitForBarrier()
} yield true
_ <- fconn.commit
} yield succeed
}

def actuallyAsync[A](ca: fconn.ConnectionIO[A]) =
Future(()).flatMap(_ => dao.transact(ca).unsafeToFuture())

dao
.transact(queries.dropAllTablesIfExist.flatMap(_ => queries.initDatabase))
.transact(simulation)
.unsafeToFuture()
.flatMap(_ =>
actuallyAsync(anUpdateThread("foo", true))
zip actuallyAsync(anUpdateThread("bar", false))
map (_ shouldBe ((true, true)))
)
}
}

Expand Down