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

BUILD: Use global port allocator for flaky HardRestartTest. (#4921)

Browse Source
This commit is contained in:
Chris Rankin 2019-03-23 19:32:39 +00:00 committed by Tommy Lillehagen
parent 738f92de0a
commit d9a67d7426
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
node/src/integration-test/kotlin/net/corda/node/services/statemachine/HardRestartTest.kt
View File

@ -19,6 +19,7 @@ import net.corda.testing.core.singleIdentity
import net.corda.testing.driver.DriverParameters import net.corda.testing.driver.DriverParameters
import net.corda.testing.driver.OutOfProcess import net.corda.testing.driver.OutOfProcess
import net.corda.testing.driver.driver import net.corda.testing.driver.driver
import net.corda.testing.driver.internal.incrementalPortAllocation
import net.corda.testing.node.User import net.corda.testing.node.User
import org.junit.Test import org.junit.Test
import java.util.* import java.util.*
@ -62,14 +63,15 @@ class HardRestartTest {
fun restartShortPingPongFlowRandomly() { fun restartShortPingPongFlowRandomly() {
val demoUser = User("demo", "demo", setOf(Permissions.startFlow<Ping>(), Permissions.all())) val demoUser = User("demo", "demo", setOf(Permissions.startFlow<Ping>(), Permissions.all()))
driver(DriverParameters( driver(DriverParameters(
portAllocation = incrementalPortAllocation(10000),
startNodesInProcess = false, startNodesInProcess = false,
inMemoryDB = false, inMemoryDB = false,
notarySpecs = emptyList(), notarySpecs = emptyList(),
systemProperties = mapOf("log4j.configurationFile" to logConfigFile.toString()) systemProperties = mapOf("log4j.configurationFile" to logConfigFile.toString())
)) { )) {
val (a, b) = listOf( val (a, b) = listOf(
startNode(providedName = DUMMY_BANK_A_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:30000")), startNode(providedName = DUMMY_BANK_A_NAME, rpcUsers = listOf(demoUser)),
startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:40000")) startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser))
).transpose().getOrThrow() ).transpose().getOrThrow()
val latch = CountDownLatch(1) val latch = CountDownLatch(1)
@ -82,7 +84,7 @@ class HardRestartTest {
Thread.sleep(ms.toLong()) Thread.sleep(ms.toLong())
(b as OutOfProcess).process.destroyForcibly() (b as OutOfProcess).process.destroyForcibly()
b.stop() b.stop()
startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:40000")) startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:${b.rpcAddress.port}"))
} }
CordaRPCClient(a.rpcAddress).use(demoUser.username, demoUser.password) { CordaRPCClient(a.rpcAddress).use(demoUser.username, demoUser.password) {
val returnValue = it.proxy.startFlow(::Ping, b.nodeInfo.singleIdentity(), 1).returnValue val returnValue = it.proxy.startFlow(::Ping, b.nodeInfo.singleIdentity(), 1).returnValue
@ -99,14 +101,15 @@ class HardRestartTest {
fun restartLongPingPongFlowRandomly() { fun restartLongPingPongFlowRandomly() {
val demoUser = User("demo", "demo", setOf(Permissions.startFlow<Ping>(), Permissions.all())) val demoUser = User("demo", "demo", setOf(Permissions.startFlow<Ping>(), Permissions.all()))
driver(DriverParameters( driver(DriverParameters(
portAllocation = incrementalPortAllocation(10000),
startNodesInProcess = false, startNodesInProcess = false,
inMemoryDB = false, inMemoryDB = false,
notarySpecs = emptyList(), notarySpecs = emptyList(),
systemProperties = mapOf("log4j.configurationFile" to logConfigFile.toString()) systemProperties = mapOf("log4j.configurationFile" to logConfigFile.toString())
)) { )) {
val (a, b) = listOf( val (a, b) = listOf(
startNode(providedName = DUMMY_BANK_A_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:30000")), startNode(providedName = DUMMY_BANK_A_NAME, rpcUsers = listOf(demoUser)),
startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:40000")) startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser))
).transpose().getOrThrow() ).transpose().getOrThrow()
val latch = CountDownLatch(1) val latch = CountDownLatch(1)
@ -119,7 +122,7 @@ class HardRestartTest {
Thread.sleep(ms.toLong()) Thread.sleep(ms.toLong())
(b as OutOfProcess).process.destroyForcibly() (b as OutOfProcess).process.destroyForcibly()
b.stop() b.stop()
startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:40000")) startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:${b.rpcAddress.port}"))
} }
CordaRPCClient(a.rpcAddress).use(demoUser.username, demoUser.password) { CordaRPCClient(a.rpcAddress).use(demoUser.username, demoUser.password) {
val returnValue = it.proxy.startFlow(::Ping, b.nodeInfo.singleIdentity(), 100).returnValue val returnValue = it.proxy.startFlow(::Ping, b.nodeInfo.singleIdentity(), 100).returnValue
@ -136,14 +139,15 @@ class HardRestartTest {
fun softRestartLongPingPongFlowRandomly() { fun softRestartLongPingPongFlowRandomly() {
val demoUser = User("demo", "demo", setOf(Permissions.startFlow<Ping>(), Permissions.all())) val demoUser = User("demo", "demo", setOf(Permissions.startFlow<Ping>(), Permissions.all()))
driver(DriverParameters( driver(DriverParameters(
portAllocation = incrementalPortAllocation(10000),
startNodesInProcess = false, startNodesInProcess = false,
inMemoryDB = false, inMemoryDB = false,
notarySpecs = emptyList(), notarySpecs = emptyList(),
systemProperties = mapOf("log4j.configurationFile" to logConfigFile.toString()) systemProperties = mapOf("log4j.configurationFile" to logConfigFile.toString())
)) { )) {
val (a, b) = listOf( val (a, b) = listOf(
startNode(providedName = DUMMY_BANK_A_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:30000")), startNode(providedName = DUMMY_BANK_A_NAME, rpcUsers = listOf(demoUser)),
startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:40000")) startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser))
).transpose().getOrThrow() ).transpose().getOrThrow()
val latch = CountDownLatch(1) val latch = CountDownLatch(1)
@ -155,7 +159,7 @@ class HardRestartTest {
println("Sleeping $ms ms before kill") println("Sleeping $ms ms before kill")
Thread.sleep(ms.toLong()) Thread.sleep(ms.toLong())
b.stop() b.stop()
startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:40000")) startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:${b.rpcAddress.port}"))
} }
CordaRPCClient(a.rpcAddress).use(demoUser.username, demoUser.password) { CordaRPCClient(a.rpcAddress).use(demoUser.username, demoUser.password) {
val returnValue = it.proxy.startFlow(::Ping, b.nodeInfo.singleIdentity(), 100).returnValue val returnValue = it.proxy.startFlow(::Ping, b.nodeInfo.singleIdentity(), 100).returnValue
@ -217,14 +221,15 @@ class HardRestartTest {
fun restartRecursiveFlowRandomly() { fun restartRecursiveFlowRandomly() {
val demoUser = User("demo", "demo", setOf(Permissions.startFlow<RecursiveA>(), Permissions.all())) val demoUser = User("demo", "demo", setOf(Permissions.startFlow<RecursiveA>(), Permissions.all()))
driver(DriverParameters( driver(DriverParameters(
portAllocation = incrementalPortAllocation(10000),
startNodesInProcess = false, startNodesInProcess = false,
inMemoryDB = false, inMemoryDB = false,
notarySpecs = emptyList(), notarySpecs = emptyList(),
systemProperties = mapOf("log4j.configurationFile" to logConfigFile.toString()) systemProperties = mapOf("log4j.configurationFile" to logConfigFile.toString())
)) { )) {
val (a, b) = listOf( val (a, b) = listOf(
startNode(providedName = DUMMY_BANK_A_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:30000")), startNode(providedName = DUMMY_BANK_A_NAME, rpcUsers = listOf(demoUser)),
startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:40000")) startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser))
).transpose().getOrThrow() ).transpose().getOrThrow()
val latch = CountDownLatch(1) val latch = CountDownLatch(1)
@ -237,7 +242,7 @@ class HardRestartTest {
Thread.sleep(ms.toLong()) Thread.sleep(ms.toLong())
(b as OutOfProcess).process.destroyForcibly() (b as OutOfProcess).process.destroyForcibly()
b.stop() b.stop()
startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:40000")) startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = listOf(demoUser), customOverrides = mapOf("p2pAddress" to "localhost:${b.rpcAddress.port}"))
} }
val executor = Executors.newFixedThreadPool(8) val executor = Executors.newFixedThreadPool(8)
try { try {
@ -253,7 +258,7 @@ class HardRestartTest {
bRestartThread.join() bRestartThread.join()
} finally { } finally {
executor.shutdown() executor.shutdownNow()
} }
} }
} }