Commit Graph

1976 Commits

Author SHA1 Message Date
Shams Asari
7f2a056c45 Merge cleanup 2018-03-22 14:21:04 +00:00
Shams Asari
83367d5474 Merge remote-tracking branch 'open/master' into os-merge-620ba1e
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
2018-03-22 14:13:50 +00:00
Shams Asari
620ba1e8a2
Integration test for network parameter updates and improved logging (#2863) 2018-03-22 14:08:07 +00:00
renlulu
7ce8d7a878 SUBMISSION - Remove repeated code (#2864) 2018-03-22 13:45:02 +00:00
Tudor Malene
72b97be42c
Merge pull request #587 from corda/feature/ENT-1637/migration-tool-changes
ENT-1673 Update migration tool to use the drivers folder and created reusable "createDatasourceFromDriverJars" function
2018-03-22 10:35:55 +00:00
Patrick Kuo
ff4bbaf63f ENT-1524 & ENT-1358: Cleaned up doorman db schema (#565)
* Renamed tables and constraints to have name < 30 characters
* Using AttributeConverters were possible for custom types
* NodeInfoEntity has relationship to accepted NetworkParametersEntity, not the hash
* Improved logging in the node
2018-03-22 06:39:02 +00:00
Andras Slemmer
34d5f72f51
Merge pull request #591 from corda/aslemmer-ENT-1647
ENT-1647: Ack duplicate messages
2018-03-21 18:45:09 +00:00
igor nitto
88d7f7f720 Fix 2018-03-21 16:35:34 +00:00
igor nitto
dc076f83ba Merge remote-tracking branch 'open/master' into merges/march-21-16-24 2018-03-21 16:30:31 +00:00
Andras Slemmer
051583b4f5 Remove spurious session rollback 2018-03-21 15:32:11 +00:00
Tudor Malene
8371a65ed8 ENT-1673 Created reusable "createDatasourceFromDriverJars" function 2018-03-21 15:32:07 +00:00
Andras Slemmer
9f0ef0157e ACK duplicate messages 2018-03-21 15:31:54 +00:00
Tudor Malene
50d9a7edb3
Merge pull request #589 from corda/merges/march-21-13-45
Merges: March 21 13:45
2018-03-21 15:01:11 +00:00
Andrius Dagys
3db40bb392 CORDA-1208: MySQL notary service - store request signature 2018-03-21 14:38:20 +00:00
igor nitto
91cda5f18a
Reintroduce accidentally removed RPC addresses print (#2857) [CORDA-1244] 2018-03-21 14:21:09 +00:00
sollecitom
3887838bc5 Merge remote-tracking branch 'remotes/open/master' into merges/march-21-13-45
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
2018-03-21 13:51:07 +00:00
szymonsztuka
49146b1cb5
ENT-1634 Fix Primary Key generation for node_notary_request_log table - part 2 (#582)
* Fix node_notary_request_log table - update Liquibase xml migration 
* (Unrelated to ENT-1634) Add database SQL setup for several tests to pass database integration tests, update SQL scripts for new  tables
2018-03-21 13:49:25 +00:00
Katarzyna Streich
75b467e340 ENT-1433: Implementation of NetworkParameters updates (#477)
* Implementation of NetworkParameters updates

Implementation of NetworkParameters updates for network-management
server side of the process.
Change the way network parameters are read up on network-management
startup. Introduced 3 flags to clearly communicate intentions:
initial-network-parameters, update-network-parameters and flag-day.

* Address Shams comments

* Address comments

* NetworkMapStorage refactor

getLatestNetworkParameters returns NetworkParametersEntity

* TODO Exit after parameters update

Started implementing feature requested by devops. TODO: Fix
NodeRegistrationTest

* Code cleanup

* Merged the two cmd line flags into one --set-network-parameters. The idea being to simply check if there are any active network parameters to determine if it's an update or not.

Applying network parameters causes the server to exit once done (ENT-1559).

* Merge fixes

* Minor cleanup

* Small fixes

* Merge fixes and cleanup

* TODO Implementation of cancelUpdate flag

Will slightly change after more manual testing

* Small cleanup

* Address comments

Add OneToOne relation between ParametersUpdate and NetworkParameters.

* Address comments fix tests
2018-03-21 12:29:27 +00:00
Michele Sollecito
ce8771900e
[CORDA-1235]: Prevent out of order consumption of initiation vs subsequent messages (#2850) 2018-03-21 11:24:53 +00:00
szymonsztuka
785891515e
Merge pull request #588 from corda/merges/ENT-1634
Merge OS -> ENT
2018-03-21 11:04:40 +00:00
szymonsztuka
b81c005230 Merge OS -> ENT 2018-03-21 09:53:28 +00:00
Rick Parker
614d2049ec
ENT-1625 Fix overly large footprint of checkpoint bandwidth histogram (#580)
* Upgrade metrics library and histogram implementation

* Only write to the "per second" checkpoint bandwidth histogram once per second, maximum.

* Bug fix

* Review feedback and fix unit test

* Fix IRS demo to use specific metrics version in spring boot
2018-03-21 09:52:29 +00:00
szymonsztuka
f1ac3c39e9
ENT-1634 Fix Primary Key generation for node_notary_request_log table (#2855)
Don't assign a value as it's auto generated, remove redundant default value for GeneratedValue strategy.
2018-03-21 09:41:50 +00:00
Thomas Schroeter
5def901980
[ENT-1639] Add version column (#585)
* Add `version` column

The equality check of the timestamp was tricky to get right. Better to
use a logical timestamp.
2018-03-20 19:08:23 +00:00
Matthew Nesbit
8ed6c556e4 Add copyright to new bridge files 2018-03-20 10:07:08 +00:00
Matthew Nesbit
9fff66257b
Merge pull request #569 from corda/mnesbit-socks-proxy-support
ENT-1614: Add SOCKS proxy capability to the AMQP Bridges
2018-03-20 09:06:06 +00:00
sollecitom
8a561cddbf Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41
# Conflicts:
#	client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/main/java/CordaCaplet.java
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-03-19 15:17:49 +00:00
igor nitto
8591ae2dc9
CordApps back in node classpath (#2843) [CORDA-1232] 2018-03-19 14:34:02 +00:00
Michele Sollecito
7a077e76f0
CORDA-1099: Orchestrated clean shutdown from Shell (#2831) 2018-03-19 14:20:10 +00:00
Shams Asari
327d7d8acf
Added sign helper method to CertificateAndKeyPair for producing SignedDataWithCert objects (#2841) 2018-03-19 12:47:23 +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
szymonsztuka
fef30e49a8
Merge pull request #576 from corda/merges/1 2018-03-16
Merge OS to Enterprise.
2018-03-19 08:18:40 +00:00
szymonsztuka
c4dc8accde Merge remote-tracking branch 'remotes/opensource/master' into merges/1 2018-03-16 17:52:01 +00:00
bpaunescu
dc595792e7
github issue #2630: missing rpc info at node startup (#2839) 2018-03-16 17:14:25 +00:00
Andras Slemmer
bb2643cf2e Add hard restart test
Remove default async db flush

Add in-memory P2P deduplication until we commit the ID persisting tx

Add some explaining comments

Make scheduled state kickoffs atomic with flow starts
2018-03-16 15:43:20 +00:00
igor nitto
286d1e5add
Propagate cordApp classloader to shell [CORDA-1228] (#2833) 2018-03-16 13:28:04 +00:00
Andrius Dagys
180abcb462 CORDA-1208: Remove unnecessary annotation from entity 2018-03-16 09:08:29 +00:00
Andrius Dagys
ac33e9401a Post merge fixes:
- Fix request log entity annotation
- Regenerate db migration changesets
- Shorten constraint names to fit under 30 chars.
2018-03-15 17:19:24 +00:00
Andrius Dagys
0d1e9694ae Merge remote-tracking branch 'open/master' into andrius-merge-1503 2018-03-15 15:07:55 +00:00
Andrius Dagys
e31d2b0cad
CORDA-1208: Notary service should persist the notarisation request si… (#2823)
* CORDA-1208: Notary service should persist the notarisation request signature along with the committed input states.

This required modifying the uniqueness provider interface to accept the signature in addition to input states.
Until now the committed state log used to be stored as a map of (state reference -> (tranasction id, consuming party)).
Adding the serialized signature would mean inflating each state entry by around 700 bytes, which would be grossly inefficient.
Instead, two tables are now used: one for storing (state referece -> transaction id) map, and another for storing the notarisation
request details (transaction id, consuming party, date, signature).

* Update api - all of these changes are only related to custom notaries
2018-03-15 13:29:42 +00:00
tudor.malene@gmail.com
81932b4e88 Merge branch 'open_master' into corda/tudor-os-merge
# Conflicts:
#	settings.gradle
#	verifier/build.gradle
#	verifier/src/integration-test/kotlin/net/corda/verifier/GeneratedLedger.kt
#	verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
#	verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
#	verifier/src/main/kotlin/net/corda/verifier/Verifier.kt
2018-03-15 10:21:35 +00:00
Tudor Malene
88c5ab8870 Feature/corda 1219/remove out of process verifier (#2820) 2018-03-15 09:57:59 +00:00
Rick Parker
a71ab3f1a1
ENT-1594 Remove usages of Guava cache. Replace with Caffeine. Added whether message is session initiation or not to cache key for de-duplication to account for the 2 P2P consumers. (#557) 2018-03-15 07:58:28 +00:00
IgorNitto
53509f9a52 Post-merge fixes 2018-03-14 17:33:51 +00:00
IgorNitto
0a0c8538c4 Merge from Corda/OS 2018-03-14 17:24:47 +00:00
igor nitto
2cff495553
Remove CordApps JARs from node classpath [CORDA-1135] (#2691) 2018-03-14 16:42:23 +00:00
Rick Parker
a24a2105b1
CORDA-1217 Replace Guava caches with Caffeine (#2818) 2018-03-14 16:07:31 +00:00
Thomas Schroeter
a2783f4c8f
Write update query in HQL (#523) 2018-03-14 15:01:04 +00:00
Matthew Nesbit
cd37f761ab
Merge pull request #476 from corda/mnesbit-external-bridge
ENT-1549: Initial Creation of Bridge/Float Process
2018-03-14 14:14:34 +00:00
Viktor Kolomeyko
8f750c0629
CORDA-1042: Change the way how Jolokia library located on the classpath so that it work on Windows (#2817)
Old code failed with:
```
11:34:01.536 [main] ERROR net.corda.node.internal.Node - Exception during node startup
java.nio.file.InvalidPathException: Illegal char <:> at index 2: /C:/Program%20Files/JetBrains/IntelliJ%20IDEA%20Community%20Edition%202017.3.1/lib/idea_rt.jar
	at sun.nio.fs.WindowsPathParser.normalize(WindowsPathParser.java:182) ~[?:1.8.0_144]
	at sun.nio.fs.WindowsPathParser.parse(WindowsPathParser.java:153) ~[?:1.8.0_144]
	at sun.nio.fs.WindowsPathParser.parse(WindowsPathParser.java:77) ~[?:1.8.0_144]
	at sun.nio.fs.WindowsPath.parse(WindowsPath.java:94) ~[?:1.8.0_144]
	at sun.nio.fs.WindowsFileSystem.getPath(WindowsFileSystem.java:255) ~[?:1.8.0_144]
	at java.nio.file.Paths.get(Paths.java:84) ~[?:1.8.0_144]
	at net.corda.node.utilities.JVMAgentRegistry.resolveAgentJar(JVMAgentRegistry.kt:46) ~[classes/:?]
	at net.corda.node.internal.AbstractNode.initialiseJVMAgents(AbstractNode.kt:785) ~[classes/:?]
	at net.corda.node.internal.AbstractNode.start(AbstractNode.kt:199) ~[classes/:?]
	at net.corda.node.internal.Node.start(Node.kt:335) ~[classes/:?]
	at net.corda.node.internal.NodeStartup.startNode(NodeStartup.kt:146) ~[classes/:?]
	at net.corda.node.internal.NodeStartup.run(NodeStartup.kt:120) [classes/:?]
	at net.corda.node.Corda.main(Corda.kt:16) [classes/:?]
```
2018-03-14 13:42:18 +00:00