ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-14 22:52:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,108 Commits 96 Branches 407 Tags
Commit Graph

36 Commits

Author SHA1 Message Date
Matthew Nesbit
8af17d4c3e During testing I observed a race condition where the bridge losing master status was terminated by the dual bridge detection logic. This code defers teh m,aster claim a few seconds to prevent thsi race condition. 2018-05-31 14:32:20 +01:00
Matthew Nesbit
f98bf4db14 The Artemis reconnection logic failed in test, because there were active artemis bridge connections. Correct the integration test, fix the bridging code and log all onError cases in the bridge. 2018-05-29 18:14:35 +01:00
Shams Asari
62f12dde11 Merge fixes, including removing dependency to Kryo in the bridge and removing the kryo serialisation scheme for the enclave. 2018-05-24 13:32:09 +01:00
Tudor Malene
7a08ebca5a Fix merge 2018-05-21 14:37:59 +01:00
Shams Asari
210a0bc9a5 Merge branch 'master' into os-merge-2907250 2018-05-21 11:26:23 +01:00
Shams Asari
b2f41d82f9 Merge fixes 2018-05-21 11:25:13 +01:00
Matthew Nesbit
93245ac07d Set the confirmationWindowSize setting in the bridge Artemis link. To reduce spam logging and improve performance. 
Fixup doc pictures to match CRL config change
 2018-05-21 09:52:04 +01:00
Katelyn Baker
c84bb7ebe0 More Fixes to cleanup after GitHub 2018-05-18 17:03:28 +01:00
Katelyn Baker
819200ee3e Create bridge serialization scheme to remove newly added dep on node 2018-05-17 17:17:22 +01:00
Matthew Nesbit
2b39e63a3f Wire up the maxMessageSize work in the bridge. 2018-05-17 15:51:42 +01:00
Katelyn Baker
a9ff1ac262 OS MERGE 
Looks like Max Message size causes all sorts of issues in the bridge,
some fixes to some issues but this needs a lot more work
 2018-05-17 15:21:37 +01:00
Matthew Nesbit
0b4e3ea5c7 Add exponential backoff to bridge Artemis reconnection 2018-05-17 08:17:09 +01:00
Matthew Nesbit
7cb6ed74d1 Allow HA topic in zookeeper to be configurable and test it. 2018-05-16 14:45:50 +01:00
Chris Rankin
ade576625e Remove unwanted transitive dependencies of Kryo from the Bridge. 2018-05-15 14:15:49 +01:00
Chris Rankin
fafd8406fd Merge commit 'd0d07287' into chrisr3-os-merge 2018-05-15 13:22:34 +01:00
Matthew Nesbit
1d1d05086f Change the FloatInner config property to BridgeInner to be more consistent. 2018-05-14 14:30:32 +01:00
Matthew Nesbit
ebe6d5060e Fix flaky integration test 
Reenable broken smokeTest so I can investigate

Testing testing

Testing testing

remove debug
 2018-05-14 11:40:25 +01:00
Viktor Kolomeyko
1425899b95
Temporarily disable failing test. (#828) 
It will be properly investigated and fixed.
 2018-05-11 10:36:23 +01:00
cburlinchon
1c2d6d8100
Unrevert artemis upgrade to 2.5.0 (#3029) (#815) 
* Revert "Revert "artemis upgrade to 2.5.0 (#3029)""
 2018-05-10 10:01:37 +01:00
Matthew Nesbit
1ae4c20b10 Slim down bridge capsule jar 
Add bridge smoke-test to :bridge:bridgecapsule to verify that all the dependencies are correctly packaged and present.

Correct proton-j version

Correct proton-j version
 2018-05-04 14:07:26 +01:00
Andrius Dagys
524ba27721 Fix merge issues 2018-05-03 13:52:11 +01:00
Michal Kit
e5e98f3540 Merge OS commit 'ab80df342ab8a7ede0539daaee9fcecd02f6aeeb' into enterprise 2018-05-03 10:55:40 +01:00
Matthew Nesbit
94bb3bd0bf The bridge HA configuration string was meant to be URL like. Correct the typo in this from zk//: to zk:// 2018-05-02 14:36:02 +01:00
Matthew Nesbit
70ca8f6d6f Add an example config with SOCKS config and a trivial test to prove we can load it. 
Address PR comment
 2018-04-27 12:56:34 +01:00
Matthew Nesbit
6d270685aa Add Artemis round-robin support for node hot-cold in-process Artemis modes. 2018-04-23 16:14:10 +01:00
Matthew Nesbit
942da1b8e0 First cut HA for bridge 
Simple implementation of bridge HA logic. Fix of shading magic in gradle. Removal of exposed curator classes from node-api interface.

Simple implementation of bridge HA logic. Fix of shading magic in gradle. Removal of exposed curator classes from node-api interface.

Modify leader priority test to catch lexical rather than numeric sorting.
 2018-04-19 16:00:11 +01:00
Matthew Nesbit
7bee15374b Changes as suggested by Clinton 2018-04-12 10:55:08 +01:00
Matthew Nesbit
478e714936 Include artifactory plugin 2018-04-12 10:25:08 +01:00
Matthew Nesbit
e51de2739c When discarding invalid messages we should consume them. When starting up wait for node bridge registration before activating the float, otherwise we have a race condition. 
Reduce excessive logging

Address PR comments

Address PR comments
 2018-04-11 15:26:27 +01:00
Matthew Nesbit
2b55a8f67e Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180411 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/main/resources/reference.conf
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-04-11 14:00:56 +01:00
Shams Asari
7296369541 Merge fixes 2018-04-04 14:52:24 +01:00
Matthew Nesbit
e79989cc8f Fixup support for customized certificate configuration 
Fix typo
 2018-04-03 11:56:10 +01:00
Matthew Nesbit
8ed6c556e4 Add copyright to new bridge files 2018-03-20 10:07:08 +00:00
Matthew Nesbit
6885661b66 Initial cut of SOCKS proxy support 
Correct the reconnect logic when SOCKS proxy is in the pipeline

Add integration tests and adjust handling of reconnect

Rename parameter
 2018-03-19 11:37:46 +00:00
Shams Asari
a99a910730
Removed duplicate SignedNetworkParameters and SignedNetworkMap type aliases (#562) 2018-03-15 20:55:40 +00:00
Matthew Nesbit
d592fb5c49 Create basic bridge module and capsule build 
Basic pieces of bridge, still very rough

Work in progress

Fixes after rebase

Primitive float tunnel implementation

Put explanatory comments on the interfaces. Add support for different SSL KeyStores for the different connections to/from the bridge and float.

Add a couple more comments

Cleanup

Fix some issues

Use a new custom header to relay the login identity from bridges. (Will add more security to this shortly)

Make key protection logic a bit clearer in the comments

Create some basic test and integrationTests

Add a couple of tests of the BridgeAMQPListenerService

Add some basic tests

Correct comment

Fixup after rebase

Fixup after rebase

Fixup after rebase

Explicit parameter types to work on build box.

Address PR comments

Address some of Mike's PR comments.

Re-enable test on enterprise.

Don't sweep up node default config

Remove obsolete config entry

Correct merge mistake

Configurable whitelist headers on bridge

Don't access primary artemis session from different threads used by inbound packet pathway.

Fix unit test
 2018-03-14 11:08:09 +00:00