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

2295 Commits

Author SHA1 Message Date
Andras Slemmer
cedfb3f069 Change flow executor thread names to be the same (#1111) 2018-06-28 11:07:28 +01:00
Andrius Dagys
75e30c8114
CORDA-1610: Retain progress tracker during flow retry - multithreaded SMM (#1049) 
* Test to show progress tracker losing updates when a flow is retried.

* Fix the injection logic - attach the new children to the old progress tracker
 2018-06-27 16:14:25 +01:00
Stefano Franz
8e75e78705
Merge pull request #1095 from corda/add_terms_to_splash 
ENT-2098 add print out of terms-of-use to node startup
 2018-06-27 15:08:26 +01:00
stefanofranz
1ff95c1916 add print out of terms-of-use to node startup 2018-06-27 13:23:31 +01:00
Andrius Dagys
4281061c47 Merge remote-tracking branch 'open/master' into andrius/os-merge-06-27 2018-06-27 10:41:28 +01:00
Andrius Dagys
fdf267d735
TimedFlowTests: remove progress tracker completion timeout (#3448) 2018-06-27 10:39:28 +01:00
Andrius Dagys
be1aff20a6
CORDA-1610: In addition to injecting the old progress tracker after flow retry, attach and re-subscribe to child trackers as well. (#3440) 2018-06-26 17:50:08 +01:00
Andrius Dagys
9258b0e63b
Minor: TimedFlowTests are sometimes flaky in CI since the flow result… (#3441) 
Minor: TimedFlowTests are sometimes flaky in CI since the flow result future completes before the progress tracker is set to DONE. Instead of checking the progress tracker step immediately, wait for it with explicit timeout.
 2018-06-26 16:07:08 +01:00
Florian Friemel
79626e9c4c
[CORDA-1598] Make argument parsing more consistent. (#3423) 
We parse command line arguments twice, once in `CordaCaplet.java`
  to determine the config file and base directory, and then again
  in NodeArgsParser. NodeArgsParser accepts long options with a
  single hyphen, while CordaCaplet did not. This changes
  CordaCaplet to accept `--config-file` as well as `-config-file`,
  same for base-dir.
 2018-06-26 14:32:45 +01:00
Katelyn Baker
7a2c15fc5e Merge remote-tracking branch 'open/master' into kat-merge-20180626 2018-06-26 12:27:24 +01:00
Michele Sollecito
2497b0b90a
Merge pull request #1073 from corda/mkit-os-ent-merge 
OS -> ENT Merge e00c7706c3f52d0e338f83d169e60c99d623f1c5
 2018-06-26 11:49:06 +01:00
Tudor Malene
4ea8091667
CORDA-1670 fix multiple CorDapps for flow check (#3436) 
* CORDA-1670 fix multiple CorDapps for flow check

* CORDA-1670 fix multiple CorDapps for flow check

* CORDA-1670 address code review comment
 2018-06-26 11:32:49 +01:00
Michele Sollecito
ab37686ba0
[ENT-2135]: Reigning in the over-ambitious flow framework default thread pool size (#1075) 2018-06-26 11:26:19 +01:00
Michal Kit
d060e95834 Merge OS -> ENT up to e00c7706c3f52d0e338f83d169e60c99d623f1c5 2018-06-26 10:02:33 +01:00
Michal Kit
e00c7706c3
CORDA-1661 Reverting DEV certificates (#3422) 
* CORDA-1661 Reverting DEV certificates

* Addressing review comments

* Removed the intermediate certificate from the trust store and added some test cases for the revocation check
 2018-06-25 16:40:51 +01:00
Tudor Malene
868763f82b
Fix for running tests from Idea (#3425) 2018-06-25 15:15:52 +01:00
Tudor Malene
9be4c5dca4
CORDA-1567 Remove all traces of the out-of-process verifier (#3424) 2018-06-25 13:01:33 +01:00
Michele Sollecito
34e52551fd
[CORDA-1663]: Node won't start if cordapps generate states prior to deletion (fix). (#3432) 2018-06-25 11:59:43 +01:00
Shams Asari
98cd8be160 Merge remote-tracking branch 'open/master' into os-merge-b97af47 
# Conflicts:
#	.idea/compiler.xml
#	docs/source/changelog.rst
#	docs/source/release-notes.rst
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
#	tools/bootstrapper/build.gradle
 2018-06-25 11:38:30 +01:00
Shams Asari
b97af477b2
CORDA-1603: Class carpenter able to synthesis Cash.State objects (#3400) 
This requires the class carpenter to be able to run in a "lenient" mode where it permits synthesised classes to implement interfaces with unimplemented methods.
 2018-06-25 11:33:37 +01:00
Anthony Keenan
7d975a43e0
Merge pull request #1058 from corda/chrisr3-os-merge 
Merge from Open Source.
 2018-06-23 17:32:27 +01:00
Shams Asari
3046843d40
CORDA-1602: Added cmd line flags to the network bootstrapper (#3419) 
The list of CorDapps jars is no longer passed in via the cmd line but is now expected to be placed in the bootstrapped directory.

Ended up being a bit of a refactor to cater for unit testing, and also tidied up the bootstrapper docs.
 2018-06-23 11:36:10 +01:00
Chris Rankin
8b3a5432cb Merge commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge 2018-06-23 00:06:11 +01:00
Rick Parker
2fe5bae8a7
ENT-1953 enterprise tuning config (#1057) 
* ENT-1953 enterprise tuning config

* Keep flowThreadPoolSize at 1 for integration tests as some expect certain ordering it seems.

* Log thread count for SMM
 2018-06-22 16:39:17 +01:00
cburlinchon
465915ac83
[ENT-1289] Exit node if db down (#918) 
* Exit if the db connection is lost
 2018-06-22 14:57:43 +01:00
Tudor Malene
1905f23093 fix merge 2018-06-21 16:51:58 +01:00
tudor.malene@gmail.com
fb3e216318 Merge remote-tracking branch 'open/master' into tudor-merge-21-06 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
#	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
 2018-06-21 16:51:19 +01:00
Florian Friemel
66b67b231a
[CORDA-1597] Make the NodeArgsParser fail on unrecognized (non-option… (#3394) 
* [CORDA-1597] Make the NodeArgsParser fail on unrecognized (non-option) arguments.

* Respond to feedback from anthonykeenan.
 2018-06-21 16:50:02 +01:00
Tudor Malene
381aadc78f
ENT-1796 RPC SSL (#3401) 
* ENT-1796 add just-generate-rpc-ssl-settings command line flag. Fix ssl configuration and documentation

* ENT-1796 small fix. change alias

* ENT-1796 address code review changes

* ENT-1796 revert file

* ENT-1796 Added check to display better error message

* ENT-1796 Doc fixes
 2018-06-21 16:46:05 +01:00
Michele Sollecito
62088e4710
Fixes (#1050) 2018-06-21 16:35:20 +01:00
Andrius Dagys
d7ee6fc361
Merge pull request #1044 from corda/andrius/merge-06-21-2 
Andrius/merge 06 21 2
 2018-06-21 15:55:05 +01:00
Michele Sollecito
cdd223378e
Fixes (#1045) 2018-06-21 15:37:45 +01:00
Andrius Dagys
a9cdb576e6 Merge remote-tracking branch 'open/master' into andrius/merge-06-21-2 2018-06-21 14:02:37 +01:00
Andrius Dagys
227ca3b65b CORDA-1610: Retain progress tracker during flow retry. 
Make sure the same progress tracker object is re-used in the restarted flow so subscribers can keep receiving progress updates.
 2018-06-21 11:44:13 +01:00
Thomas Schroeter
ed3944c546
Create Artemis p2p.inbound addresses before starting the broker (#3407) 2018-06-20 16:24:30 +01:00
bpaunescu
ddcdb370b3
ENT-2053 Artemis cleanup fix (#987) 
* Bridge kill test

Fix Artemis settings

ENT-2053: add quasar for gradle file

Add several flow + bridge kill test

Debugging

Potential fix

* ENT-2053: create p2p queues in exclusive mode to avoid reordering when bridge is killed

* ENT-2053: add exclusive flag to rest of p2p queues

* ENT-2053: check addresses' types when creating queues for exclusive mode

* Revert "Debugging"

This reverts commit d48a49c91f3fba0609b9b744c78fc671f4a92076.

* ENT-2053:address PR comments
 2018-06-20 13:06:24 +01:00
sollecitom
da22fa4db4 Merged open master 2018-06-19 17:39:33 +01:00
Andrius Dagys
abfdfc1a66 CORDA-1645: Fix compilation issue (#3404) 2018-06-19 17:10:16 +01:00
sollecitom
bf1b3a37ce Merge remote-tracking branch 'remotes/open/master' into merges/june-19-16-47 2018-06-19 16:48:12 +01:00
Michele Sollecito
af93ff8d1c
[CORDA-1638]: Node crashes in --initial-registration polling mode if doorman returns a transient HTTP error (fix). (#3403) 2018-06-19 16:43:46 +01:00
Andrius Dagys
41648d5a15
CORDA-1645: Checkpoint before calling an idempotent sub-flow. (#3399) 
* CORDA-1645: Checkpoint before calling an idempotent sub-flow.

When an idempotent sub-flow causes a flow restart, the flow will be
replayed from the last checkpoint before the sub-flow invocation.
However, the logic between the last checkpoint and the sub-flow invocation
may contain side-effects which shouldn't be replayed. Thus we need to persist
a checkpoint just before an idempotent sub-flow is invoked.
 2018-06-19 16:42:55 +01:00
szymonsztuka
acefaceaf6 [CORDA-1605]: When one node in a transaction fails to respond, operator of initiating node needs to understand which node it is waiting for. 2018-06-19 11:59:01 +01:00
szymonsztuka
f99f483f0d Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-19-2dded2a 2018-06-19 11:18:28 +01:00
Tudor Malene
41776ed374
CORDA-1407 Node Explorer - fix total column (#3395) 2018-06-19 09:19:19 +01:00
Michele Sollecito
20aca788ce
[CORDA-1605]: When one node in a transaction fails to respond, operator of initiating node needs to understand which node it is waiting for (fix) (#3393) 2018-06-18 17:59:00 +01:00
Florian Friemel
ad76b7821e
Merge remote-tracking branch 'open/master' into os-merge-2018-06-18-17_42 2018-06-18 17:51:41 +01:00
Michele Sollecito
c2585e8c8e
[CORDA-1595]: If adminAddress is not included in rpcSettings configuration node fails with NullPointerException (fix). (#3385) 2018-06-18 13:41:31 +01:00
rick.parker
14e30a9e65 Fix failing unit test missing some mocked attributes. 2018-06-18 10:30:16 +01:00
rick.parker
3a390e3643 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-201806-15-1 2018-06-15 17:06:09 +01:00
Rick Parker
999ee49804
ENT-2053 Fix messaging TTL related settings causing disconnects (#3384) 
* ENT-2053 Revert RPC TTL due to hanging RPC clients.

* ENT-2053 Set TTL correctly.
 2018-06-15 16:57:49 +01:00