12405 Commits

Author SHA1 Message Date
szymonsztuka
68fcda5548
ENT-1709 Documentation for standalone database setup (#949)
Added SQL scripts to create database/clean up database, example CordFormation to use with remote database, several clarifications.
2018-06-08 16:50:47 +01:00
Patrick Kuo
2fce979fe7 CORDA-1604 Node Info file watcher should block and load node info when node startup (#959) 2018-06-08 16:30:37 +01:00
Stefano Franz
68e1d281bc
Merge pull request #960 from roastario/remove_launcher_as_runtime_from_node
Remove launcher as runtime dependency from node
2018-06-08 15:45:02 +01:00
Stefano Franz
b9ed001358 remove runtime dependency on launcher for node as the capsule launching process is still used if not running from official distribution 2018-06-08 14:22:06 +01:00
josecoll
002d5a8f10
Publish tools to Artifactory: Blob Inspector, Network Bootstrapper (#3321)
* Added missing plugin to enable publishing of artifact to Artifactory.

* Remove references to experimental blobinspector

* Remove disableDefaultJar for default jar.

* Add additional artifacts to be published.
2018-06-08 14:02:57 +01:00
Stefano Franz
984dcf3100
Merge pull request #958 from roastario/publish_launcher
add launcher to list of published artifacts
2018-06-08 14:02:19 +01:00
szymonsztuka
72d47bb41b
Merge pull request #956 from corda/merges/os-2018-06-08-szymon
OS -> ENT merge up to baa6479
2018-06-08 13:28:19 +01:00
Stefano Franz
e470fa60c0 add launcher to list of published artifact:wq 2018-06-08 12:32:49 +01:00
Joel Dudley
238dc477e3
Only 7 terminal windows appear (notary's was removed). (#3328) 2018-06-08 12:15:44 +01:00
szymonsztuka
04cb9c9872 Add copyright to source files. 2018-06-08 11:05:29 +01:00
szymonsztuka
e266c8c2a7 Add copyright to source files. 2018-06-08 11:02:16 +01:00
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
Joel Dudley
0cab721b47
Documents use of $ to access internal classes. (#3325) 2018-06-08 10:23:05 +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
Tudor Malene
db3da50070
Merge pull request #953 from corda/tudor-os-merge-7-jun
Tudor os merge 7 jun
2018-06-07 18:00:15 +01:00
Andras Slemmer
6661ee8a3e Add doc 2018-06-07 17:08:20 +01:00
Andras Slemmer
768d9309dc Various tests and fixes related to CORDA-1191 2018-06-07 16:51:04 +01:00
Chris Rankin
21280c029e
ENT-1463, ENT-1903: Document the "determinisation" process. (#3297) 2018-06-07 16:49:39 +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
Joel Dudley
9514ad6be1
Workaround if six is already installed. (#3320)
* Help message if build fails.

* Fix formatting.
2018-06-07 16:13:59 +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
e7d98f52aa
Merge pull request #945 from corda/andrius/merge-06-07
OS merge
2018-06-07 15:59:35 +01:00
josecoll
b742fdd680 Fix incorrect repoKey used to publish to Artifactory. 2018-06-07 15:14:02 +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
Matthew Nesbit
c160e9dc98
Merge pull request #933 from corda/mnesbit-update-test-script
Update notary name to match deployed name in fbantesting environment
2018-06-07 11:01:18 +01:00
szymonsztuka
d821f6d9e3
ENT-2035 / ENT-2037 Document JDBC driver in ./drivers directory (#939)
Enterprise tarball Corda distribution can only load JDBC jars from relative ./drivers directory.
The Capsule version can use directory specified by jarDirs config property and jarDirs was documented as a way to add JDBC drivers.
To make it consistent between tarball and Capsule version enterprise docs will be updated to use ./drivers dir, still preserving jarDirsbut state this option is not advisable and depending on the distribution may not work.
2018-06-07 10:35:00 +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
Michele Sollecito
4bb548c09b
[ENT-1894]: Change old log for new red-white one. (#941) 2018-06-06 17:02:58 +01:00
josecoll
4527717923
Publish tools (database migration, network bootstrapper, blob inspector) to distribution repositories. (#938)
Remove references to doorman artifacts.
2018-06-06 15:33:28 +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
Tudor Malene
4ba4e6d908
Merge pull request #940 from corda/tudor-merge-6-Jun
Tudor merge 6 jun
2018-06-06 15:12:36 +01:00
tudor.malene@gmail.com
5232c2e0e3 Merge remote-tracking branch 'open/master' into tudor-merge-6-Jun 2018-06-06 13:38:45 +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
Shams Asari
6a2e50b730
Blobinspector: trace level logging with --verbose (#3313) 2018-06-06 13:19:18 +01:00
Tudor Malene
5f2c3d175d
ENT-2036 Handle ClosedChannelException during SSL handshake (#3314) 2018-06-06 13:08:33 +01:00
Andras Slemmer
e2b4943bbb Observable toposort for transactions (#3027) 2018-06-06 13:58:23 +02:00
Mike Hearn
468c0c7404
CORDA-1349: Docs: improve docs on permissioning, doorman and network map. (#3277)
* Docs: improve docs on permissioning, doorman and network map.

* Add a convenience serialization API for Java users, marked as
internal for now with a TODO to make it public after we start work on
Corda 4.0. Otherwise serializing arbitrary objects to AMQP is awkward.
2018-06-06 13:57:25 +02: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
Matthew Nesbit
66b86f1939 Update notary name to match deployed name in fbantesting environment 2018-06-06 09:49:46 +01:00