ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-14 13:18:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-3025 Thread-safe liquibase migrations

Browse Source
This commit is contained in:
James Brown
2019-03-01 10:31:09 +00:00
committed by Mike Hearn
parent e7534b3a7d
commit a18e44ed8f
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt
View File

@ -19,6 +19,8 @@ import java.io.InputStream
import java.nio.file.Path import java.nio.file.Path
import java.sql.Statement import java.sql.Statement
import javax.sql.DataSource import javax.sql.DataSource
import java.util.concurrent.locks.ReentrantLock
import kotlin.concurrent.withLock
// Migrate the database to the current version, using liquibase. // Migrate the database to the current version, using liquibase.
// //
@ -38,6 +40,7 @@ class SchemaMigration(
const val NODE_BASE_DIR_KEY = "liquibase.nodeDaseDir" const val NODE_BASE_DIR_KEY = "liquibase.nodeDaseDir"
const val NODE_X500_NAME = "liquibase.nodeName" const val NODE_X500_NAME = "liquibase.nodeName"
val loader = ThreadLocal<CordappLoader>() val loader = ThreadLocal<CordappLoader>()
private val mutex = ReentrantLock()
} }
init { init {
@ -113,16 +116,21 @@ class SchemaMigration(
System.setProperty(NODE_X500_NAME, ourName.toString()) System.setProperty(NODE_X500_NAME, ourName.toString())
val customResourceAccessor = CustomResourceAccessor(dynamicInclude, changelogList, classLoader) val customResourceAccessor = CustomResourceAccessor(dynamicInclude, changelogList, classLoader)
val liquibase = Liquibase(dynamicInclude, customResourceAccessor, getLiquibaseDatabase(JdbcConnection(connection))) // current version of Liquibase appears to be non-threadsafe
// this is apparent when multiple in-process nodes are all running migrations simultaneously
mutex.withLock {
val liquibase = Liquibase(dynamicInclude, customResourceAccessor, getLiquibaseDatabase(JdbcConnection(connection)))
val unRunChanges = liquibase.listUnrunChangeSets(Contexts(), LabelExpression()) val unRunChanges = liquibase.listUnrunChangeSets(Contexts(), LabelExpression())
when { when {
(run && !check) && (unRunChanges.isNotEmpty() && existingCheckpoints!!) -> throw CheckpointsException() // Do not allow database migration when there are checkpoints (run && !check) && (unRunChanges.isNotEmpty() && existingCheckpoints!!) -> throw CheckpointsException() // Do not allow database migration when there are checkpoints
run && !check -> liquibase.update(Contexts()) run && !check -> liquibase.update(Contexts())
check && !run && unRunChanges.isNotEmpty() -> throw OutstandingDatabaseChangesException(unRunChanges.size) check && !run && unRunChanges.isNotEmpty() -> throw OutstandingDatabaseChangesException(unRunChanges.size)
check && !run -> {} // Do nothing will be interpreted as "check succeeded" check && !run -> {
else -> throw IllegalStateException("Invalid usage.") } // Do nothing will be interpreted as "check succeeded"
else -> throw IllegalStateException("Invalid usage.")
}
} }
} }
} }