2331 Commits

Author SHA1 Message Date
szymonsztuka
d4d459cf22 Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-08-szymon 2018-06-08 10:57:50 +01:00
Shams Asari
443277ef60
Merge pull request #954 from corda/os-merge-21280c0
O/S merge from 21280c0
2018-06-08 10:38:17 +01:00
szymonsztuka
baa6479575
ENT-1712 Warning on cross-reference between JPA entities from different mapped schemas (#3282)
At startup node warns about any MappedSchema containing a JPA entity referencing to another JPA entity from a different MappedSchema. Cross reference between JPA entities across different MappedSchema objects can cause operational issues while evolving one MappedSchema object or migrating it's data. Doc API: Persistence documentation no longer suggests mapping between different schemas.
2018-06-08 10:25:50 +01:00
Tudor Malene
b9bf624e7a
ENT-1873 address code review changes (#3323) 2018-06-08 10:24:00 +01:00
Tudor Malene
f4f8bc3c8c
Reapply lost fix (#952) 2018-06-08 10:23:27 +01:00
Shams Asari
ef5faeaf26 Merge fix 2018-06-07 18:14:44 +01:00
Shams Asari
7886ef9450 Merge remote-tracking branch 'open/master' into os-merge-21280c0
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/statemachine/FlowHospital.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/PropagatingFlowHospital.kt
2018-06-07 18:08:37 +01:00
Shams Asari
f6a23a0216
CORDA-1546: Updated the flow hospital to suspend FinalityHandler if it errors (#3304)
It will re-run automatically from last checkpoint on node restart, allowing the opportunity to resolve the issue, something required when dealing with contract constraint failures.
2018-06-07 16:18:00 +01:00
tudor.malene@gmail.com
5140d46aa2 Merge remote-tracking branch 'open/master' into tudor-os-merge-7-jun
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
2018-06-07 16:05:11 +01:00
Andrius Dagys
65eddbb025 CORDA-1494: Handle TimedFlow in MultiThreadedStateMachineManager 2018-06-07 14:29:15 +01:00
Tudor Malene
c474c04503
ENT-1837 better error message on db failure (#3318) 2018-06-07 14:05:28 +01:00
Rick Parker
aa01ef638b
CORDA-1589 Flow hospital reports incorrect number of patients and fix… (#3315)
* CORDA-1589 Flow hospital reports incorrect number of patients and fix flakey associated test.

* Compare before and after count, not against zero.  There's a leak in killFlow that will be easier to address in or after Shams PR.
2018-06-07 09:12:25 +01:00
Andrius Dagys
d24299341c Merge remote-tracking branch 'open/master' into andrius/merge-06-07 2018-06-07 08:53:28 +01:00
Andrius Dagys
0978d041a3
CORDA-1494: Re-enable notarisation retries in the new state machine manager (#3295)
* Remove all notion of message level retry.

* Introduce randomness into de-duplication IDs based on the session rather than the flow, in support of idempotent flows.

* CORDA-1494: Re-enable notarisation retries in the new state machine manager.

The original message-based retry approach does not work well with the new
flow state machine due to the way sessions are handled. We decided to move
the retry logic to flow-level: introduce RetryableFlow that won't have
checkpoints persisted and will be restarted after a configurable timeout
if it does not complete in time.

The RetryableFlow functionality will be internal for now, as it's mainly
tailored for the notary client flow, and there are many subtle ways it can
fail when used with arbitrary flows.
2018-06-07 08:45:32 +01:00
Tudor Malene
b823330a75
ENT-2036 handle ClosedChannelException during ssl handshake (#934)
* ENT-2036 handle ClosedChannelException during ssl handshake

* ENT-2036 address code review comments and revert AMQPChannelHandler as it will be fixed in OS first
2018-06-06 15:13:17 +01:00
Shams Asari
11b78296eb
Merge pull request #936 from corda/os-merge-d620e71
O/S merge from d620e71
2018-06-06 13:27:03 +01:00
Matthew Nesbit
2aac9e8687
Merge pull request #921 from corda/ENT-1983
ENT-1983: throw more specific exception when starting a flow as a result
2018-06-06 12:09:10 +01:00
Rick Parker
d675a17e17
ENT-2023 Restore rpcThreadPoolSize enterprise config setting (#922)
* Add a sampler for EmptyFlow, and also re-establish wiring to the rpcThreadPoolSize config parameter.

* Remove mutex from multi-threaded SMM startFlow

* Add EmptyFlow to nightly benchmark and also a CashIssue 200
2018-06-06 11:47:37 +01:00
Shams Asari
f34a2bd33f Replacing uses of assert with require 2018-06-06 09:56:04 +01:00
Shams Asari
11fd70a1f7 Merge remote-tracking branch 'open/master' into os-merge-d620e71
# Conflicts:
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
2018-06-06 09:51:29 +01:00
Shams Asari
d620e71bb6
Replaced all uses of assert with require (#3309)
JVM assertions have to be enabled with the -ea flag so it's possible for these checks to be ignored.
2018-06-06 00:31:41 +01:00
Rick Parker
7e3e94cee9
OS -> ENT merge (#928)
* Revert back logging of tests (#3305)

* ENT-2023 Minimise code diff between OS and ENT for enterprise change since code diff during merge resulted in a bad merge relating to rpcThreadPoolSize. (#3306)
2018-06-05 19:53:07 +01:00
Maksymilian Pawlak
f4621d9a74
[CORDA-1297] Column nullability in migrations (#916)
* Migrations to proper nullability

* Removed node-core.changelog-v3-GA.xml file as indicated by PR comments, This change was already provided by nullability upgrade commits
2018-06-05 18:13:49 +01:00
Rick Parker
e2a2c2d20d
ENT-2023 Minimise code diff between OS and ENT for enterprise change since code diff during merge resulted in a bad merge relating to rpcThreadPoolSize. (#3306) 2018-06-05 17:38:55 +01:00
Matthew Nesbit
4882e2e089 Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180605 2018-06-05 13:37:35 +01:00
Matthew Nesbit
0812329aaf
The logic in my recent late start bridge PR was wrong. This doesn't affect embedded bridges, but for external bridges the state doesn't reset correctly on bridge restart. (#3301) 2018-06-05 13:30:20 +01:00
bogdan
644f1c6d2f ENT-1983: throw more specific exception when starting a flow as a result
of P2P messaging and SMM is stopped.
2018-06-04 19:03:36 +01:00
szymonsztuka
703f0cc86f Liquibase script for a table name node_attchments_contracts change following fix for CORDA-1499 merged from OS. 2018-06-04 17:53:01 +01:00
szymonsztuka
f5c9a398ad Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-04-szymon
# Conflicts:
#	docs/source/upgrade-notes.rst
#	node/src/integration-test/kotlin/net/corda/node/BootTests.kt
2018-06-04 17:35:19 +01:00
Tudor Malene
4f1a22dfac
Merge pull request #910 from corda/tudor-merge-os-01_06
Tudor merge os 01 06
2018-06-04 15:37:33 +01:00
Tudor Malene
3b65ca2ab6 Temporary ignore flaky Test to unblock merge 2018-06-04 14:13:59 +01:00
Tudor Malene
18a6e2fa2a
CORDA-1477 backport Ent test fixes (#3292) 2018-06-04 13:49:25 +01:00
Tudor Malene
29da4b02a6 Fix tests 2018-06-04 11:58:41 +01:00
szymonsztuka
63f11d0b54
Upgrade integration test for CORDA-1356 to run in database mode (#899)
Add SQL setup to run integration test in database mode, add ordering in test because original assumption that rows are returned as inserted doesn't work in Oracle db, ensure distinct names when starting nodes (they can't clash in database mode, as the schema name is taken from node name).
2018-06-04 10:31:56 +01:00
bpaunescu
71d8586e61
ENT-1962: throw a clearer exception when starting RPC flow while SMM is stopped … (#912)
* ENT-1962: throw a clearer exception when starting RPC flow while SMM is stopped.

* ENT-1962: update exception constructor
2018-06-04 10:14:53 +01:00
Michele Sollecito
7350cd9d1e
[CORDA-1408]: Fixed some Demobench bugs. (#3288) 2018-06-04 09:35:38 +01:00
josecoll
76644e0d00
ENT-1871 Rebrand R3Corda to Corda Enterprise (#907)
* Final part of rebranding exercise.

* Fix test.
2018-06-02 10:47:31 +01:00
Tudor Malene
0ecacb894e Fix merge 2018-06-01 17:14:27 +01:00
Michele Sollecito
fc020bca4b
[CORDA-1575]: Out of process nodes started by the driver do not log to file (fix). (#3286) 2018-06-01 16:16:23 +01:00
szymonsztuka
57d379597b
Fix a typo in node_attchments_contracts table name. (#3202) 2018-06-01 16:08:19 +01:00
Rick Parker
609c313496
CORDA-1564 Remove old sessions on flow retry from multi-threaded SMM (#906) 2018-06-01 15:38:09 +01:00
Tudor Malene
6dc778e404 Fix merge 2018-06-01 14:28:23 +01:00
tudor.malene@gmail.com
eb801d40b8 Merge remote-tracking branch 'open/master' into tudor-merge-os-01_06
# Conflicts:
#	core/src/main/kotlin/net/corda/core/cordapp/Cordapp.kt
#	core/src/main/kotlin/net/corda/core/internal/cordapp/CordappImpl.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
2018-06-01 13:56:43 +01:00
Tudor Malene
9efb1ecfe0
CORDA-1477 add check for code version in checkpoints (#3256)
* CORDA-1477 add check for code version in checkpoints

* CORDA-1477 Comment style

* CORDA-1477 address code review comments

* CORDA-1477 add changelog entry

* CORDA-1477 attempt to fix tests

* CORDA-1477 attempt to fix tests and address code review comments

* CORDA-1477 attempt to fix tests
2018-06-01 13:37:39 +01:00
sollecitom
c0ddb0b026 Merge remote-tracking branch 'remotes/open/master' into merges/may-31-19-04
# Conflicts:
#	docs/source/network-map.rst
2018-05-31 19:06:28 +01:00
Rick Parker
51c359c48d
CORDA-1564 Clean up old sessions when retrying flows. (#3278) 2018-05-31 18:43:50 +01:00
Shams Asari
1feeda7d3b Merge remote-tracking branch 'open/master' into os-merge-34a480d 2018-05-31 17:45:06 +01:00
Shams Asari
34a480d7e3
Move checkPayloadIs out of the public API (#3279) 2018-05-31 17:40:49 +01:00
cburlinchon
675059bfa8
System.exit node if artemis is closed (#898) 2018-05-31 15:08:46 +01:00
Katarzyna Streich
509b556807 Merge branch 'master' into kstreich-OS-ENT-merge-310518 2018-05-31 11:48:02 +01:00