ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-31 16:35:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Allow HA topic in zookeeper to be configurable and test it.

Browse Source
This commit is contained in:
Matthew Nesbit 2018-05-16 14:45:50 +01:00
parent 478558bd8a
commit 7cb6ed74d1
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bridge/src/integration-test/kotlin/net/corda/bridge/BridgeIntegrationTest.kt
View File

@ -192,7 +192,7 @@ class BridgeIntegrationTest {
val bridgeFolder = tempFolder.root.toPath() val bridgeFolder = tempFolder.root.toPath()
val bridgeConfigResource = "/net/corda/bridge/hawithfloat/bridge/bridge.conf" val bridgeConfigResource = "/net/corda/bridge/hawithfloat/bridge/bridge.conf"
val bridgeConfig = createAndLoadConfigFromResource(bridgeFolder, bridgeConfigResource) val bridgeConfig = createAndLoadConfigFromResource(bridgeFolder, bridgeConfigResource)
assertEquals(BridgeHAConfigImpl("zk://localhost:11105", 10), bridgeConfig.haConfig) assertEquals(BridgeHAConfigImpl("zk://localhost:11105", 20, "/custom/bridge/ha"), bridgeConfig.haConfig)
bridgeConfig.createBridgeKeyStores(DUMMY_BANK_A_NAME) bridgeConfig.createBridgeKeyStores(DUMMY_BANK_A_NAME)
createNetworkParams(bridgeFolder) createNetworkParams(bridgeFolder)
val floatFolder = tempFolder.root.toPath() / "float" val floatFolder = tempFolder.root.toPath() / "float"
@ -226,7 +226,7 @@ class BridgeIntegrationTest {
assertEquals(true, bridge.active) assertEquals(true, bridge.active)
assertEquals(true, float.active) assertEquals(true, float.active)
assertEquals(true, serverListening("localhost", 10005)) assertEquals(true, serverListening("localhost", 10005))
val higherPriorityClient = ZkClient("localhost:11105", "/bridge/ha", "Test", 5) val higherPriorityClient = ZkClient("localhost:11105", "/custom/bridge/ha", "Test", 5)
higherPriorityClient.start() higherPriorityClient.start()
higherPriorityClient.requestLeadership() // should win leadership and kick out our bridge higherPriorityClient.requestLeadership() // should win leadership and kick out our bridge
assertEquals(false, bridgeStateFollower.next()) assertEquals(false, bridgeStateFollower.next())

1
bridge/src/main/kotlin/net/corda/bridge/services/api/BridgeConfiguration.kt
View File

@ -87,6 +87,7 @@ interface BridgeInnerConfiguration {
interface BridgeHAConfig { interface BridgeHAConfig {
val haConnectionString: String val haConnectionString: String
val haPriority: Int val haPriority: Int
val haTopic: String
} }
/** /**

2
bridge/src/main/kotlin/net/corda/bridge/services/config/BridgeConfigurationImpl.kt
View File

@ -51,7 +51,7 @@ data class FloatOuterConfigurationImpl(override val floatAddress: NetworkHostAnd
override val expectedCertificateSubject: CordaX500Name, override val expectedCertificateSubject: CordaX500Name,
override val customSSLConfiguration: BridgeSSLConfigurationImpl?) : FloatOuterConfiguration override val customSSLConfiguration: BridgeSSLConfigurationImpl?) : FloatOuterConfiguration
data class BridgeHAConfigImpl(override val haConnectionString: String, override val haPriority: Int = 10) : BridgeHAConfig data class BridgeHAConfigImpl(override val haConnectionString: String, override val haPriority: Int = 10, override val haTopic: String = "/bridge/ha") : BridgeHAConfig
data class BridgeConfigurationImpl( data class BridgeConfigurationImpl(
override val baseDirectory: Path, override val baseDirectory: Path,

2
bridge/src/main/kotlin/net/corda/bridge/services/ha/ExternalMasterElectionService.kt
View File

@ -45,7 +45,7 @@ class ExternalMasterElectionService(val conf: BridgeConfiguration,
val info = ManagementFactory.getRuntimeMXBean() val info = ManagementFactory.getRuntimeMXBean()
val pid = info.name.split("@").firstOrNull() // TODO Java 9 has better support for this val pid = info.name.split("@").firstOrNull() // TODO Java 9 has better support for this
val nodeId = "$hostName:$pid" val nodeId = "$hostName:$pid"
val leaderElector = ZkClient(zkConf, "/bridge/ha", nodeId, leaderPriority) val leaderElector = ZkClient(zkConf, conf.haConfig!!.haTopic, nodeId, leaderPriority)
haElector = leaderElector haElector = leaderElector
val listener = object : CordaLeaderListener { val listener = object : CordaLeaderListener {
override fun notLeader() { override fun notLeader() {

2
bridge/src/test/resources/net/corda/bridge/hawithfloat/bridge/bridge.conf
View File

@ -18,4 +18,6 @@ bridgeInnerConfig : {
networkParametersPath = network-parameters networkParametersPath = network-parameters
haConfig : { haConfig : {
haConnectionString = "zk://localhost:11105" haConnectionString = "zk://localhost:11105"
haPriority = 20
haTopic = "/custom/bridge/ha"
} }