2404 Commits

Author SHA1 Message Date
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
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
Chris Rankin
9b5a099302
ENT-2105: Remove unnecessary sourceSets from integration tests. (#1029)
The database scripts are already available from the test-utils JAR via the classpath and so don't need
to be included as additional source sets.
2018-06-20 15:38:48 +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
Stefano Franz
d054238f19
ENT-2013 fix issue when a node is restarted with the same entity, but different keypair (#3319)
* fix issue when a node is restarted with the same entity, but different keypair

* address review comment

* remove incorrect test
2018-06-15 16:01:56 +01:00
Rick Parker
92d44bf68a
CORDA-1622 Fix misuse of volatile (#3375) 2018-06-15 14:51:47 +01:00
Thomas Schroeter
230d5e294e
ENT-2084 Fix CheckpointVerifier (#3374) 2018-06-15 09:17:10 +01:00
Konstantinos Chalkias
5a6af7f8ce Merge remote-tracking branch 'open/master' into kostas-merge-14_06_2018 2018-06-14 14:43:44 +01:00
Katarzyna Streich
3d107200a1
Fix flaky test (#3363) 2018-06-14 10:20:18 +01:00
Tommy Lillehagen
a612ca234a Merge remote-tracking branch 'open/master' into tlil-os-merge-20180613 2018-06-13 21:45:00 +01:00
Tommy Lillehagen
18cfcb887d
Merge pull request #3359 from corda/tlil/CORDA-1609/fix-rpc-config-api-break
CORDA-1609 - Don't use reserved keyword as method name
2018-06-13 18:25:23 +01:00
Andrius Dagys
0056a2232c
CORDA-1628: Increase max restart count for notary client flows. (#3357)
This will ensure that the notary client flow will retry over a sufficient
period of time for the notary to update its network map.

With a backoff base of 1.8 and 5 retries the last retry will fire after
about 20 min 8 sec of the initial flow start:

#   Timeout, sec
0	30
1	54
2	97.2
3	174.96
4	314.928
5	566.8704

Total 1207.9584	= 20.13264 min
2018-06-13 17:46:32 +01:00
Rick Parker
aa09e81464 CORDA-1599 Add remove call to multi-threaded killFlow implementation (#971) 2018-06-13 16:56:01 +01:00
James Brown
026a4864b1
ENT-1387 h2port config changes with new h2Settings block
* Introduce new h2Settings config block which overrides h2Port
* H2 server listens on localhost by default
* Change is backward compatible and old h2Port option can still be used but that always listens  on localhost now
* Update changelog and docs with H2 changes
2018-06-13 16:23:39 +01:00
Michele Sollecito
ac590d7920
Merge pull request #988 from corda/merges/june-13-13-27
Merges: June 13 at 13:27
2018-06-13 15:46:27 +01:00
Tommy Lillehagen
fe313951ea CORDA-1609 - Don't use reserved keyword as method name
As reported in [CORDA-1609](https://r3-cev.atlassian.net/browse/CORDA-1609),
`CordaRPCClientConfiguration.default` is not accessible from Java since
`default` is a reserved keyword.

As part of the refactor made in #2831, `CordaRPCClientConfiguration` went
from being a data class to an interface with a backing implementation of
type `CordaRPCClientConfigurationImpl`.

This resulted in Java users having to rewrite code that was on the form:

```java
final CordaRPCClient client = new CordaRPCClient(
    nodeAddress, CordaRPCClientConfiguration.DEFAULT
);
```

to something like this:

```java
final CordaRPCClient client = new CordaRPCClient(
    nodeAddress, CordaRPCClientConfiguration.Companion.default()
);
```

However, this does not work. The user would get a compilation error because
`default` is a reserved keyword in Java.

Since `CordaRPCClientConfiguration` has been made an interface, there is no
easy way of introducing a static final field on the interface from Kotlin.

Consequently, I've changed this back to using a `class` with a static field
named `DEFAULT` instead of the static method `default()`.

It should be noted that `default()` / `DEFAULT` is currently only used
internally to pass in default values in `CordaRPCClient.kt` and
`CordaRPCClientUtils.kt`. That said, it is exposed as part of our API
surface and consequently shouldn't be broken.

The latter means that in the above example, the user would actually not
have to provide the parameter at all:

```java
final CordaRPCClient client = new CordaRPCClient(nodeAddress);
```

As can be seen from the definition of `CordaRPCClient`:

```kotlin
class CordaRPCClient private constructor(...) {
    @JvmOverloads
    constructor(
        hostAndPort: NetworkHostAndPort,
        configuration: CordaRPCClientConfiguration = CordaRPCClientConfiguration.DEFAULT
    ) : this(hostAndPort, configuration, null)
```

The mentioned [refactor](7a077e76f0 (diff-0948c125db93a22263eb81eaf3161c17R65))
did not make it into the 3.1 release, so from an API-stability perspective,
this change can be applied without affecting our commitment to a
backwards compatible API..
2018-06-13 15:39:03 +01:00
sollecitom
86b34b1227 Merge remote-tracking branch 'remotes/open/master' into merges/june-13-13-27
# Conflicts:
#	docs/source/changelog.rst
#	docs/source/index.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
2018-06-13 13:36:31 +01:00
Rick Parker
d95b1b0e6a
CORDA-1622 Correct broken de-dup header logic on node restart for restored flows. Multi-threaded version. (#985) 2018-06-13 13:31:18 +01:00
cburlinchon
70a1a3a3d4
[ENT-2039] Move mutual exclusion check to run first (#946)
* Don't sleep inside database transaction
2018-06-13 13:31:02 +01:00
rick.parker
dce127768a CORDA-1599 Compilation fixes. 2018-06-13 11:13:47 +01:00
rick.parker
cb810f0660 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180613-1
# Conflicts:
#	.idea/compiler.xml
#	build.gradle
#	docs/source/changelog.rst
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
2018-06-13 11:13:43 +01:00
Matthew Nesbit
4bf5d809a5
If the Artemis connectionTTL configuration is not set then some of the cleanup actions do not happen on client kill. This prevents durable messages being replayed (#3351)
and may prevent cleanup of other resources.

Undo spurious code
2018-06-13 10:32:29 +01:00
Andrius Dagys
d5d46c674d CORDA-1494: Minor - improve error message when max retries reached for notarisation (#3355) 2018-06-13 09:04:05 +01:00
Chris Rankin
2522cee010
Merge pull request #977 from corda/chrisr3-os-merge
Merge from OS up to 8087f3c5d3c823a5fbda9a728f129b0925c1fddb.
2018-06-12 18:45:12 +01:00
Rick Parker
2f737cd6bc
CORDA-1622 Correct broken de-dup header logic on node restart for res… (#3352)
* CORDA-1622 Correct broken de-dup header logic on node restart for restored flows.

* Missed a volatile
2018-06-12 18:00:44 +01:00
Christian Sailer
b09a57d768
ENT-1943 non clustered primary keys (#880)
* ENT-1943 Add liquibase change sets to remove clustered indices from primary  keys

* ENT-1943 Add liquibase change sets to remove clustered indices from primary  keys

* Don't apply non-clustered PK change when using H2

* Move primary key changesets to separate file for core migration files
Use `onValidationFail` rather than precondition to exclude these changes from H2

* Remove/readd foreign key constraint to make SQL server less unhappy

* Fix linear states schema migration

* Fix notary states changelog issues

* Remove v3-GA from master changelog
2018-06-12 15:40:25 +01:00
Chris Rankin
319953ba41 Merge commit '8087f3c5d3c823a5fbda9a728f129b0925c1fddb' into chrisr3-os-merge 2018-06-12 14:11:27 +01:00
Rick Parker
dd564cfc79
CORDA-1599 Fix a small race we have with waiting for mock network to … (#3348)
* CORDA-1599 Fix a small race we have with waiting for mock network to become inactive that is affecting tests.

* Missed println
2018-06-12 12:59:35 +01:00
Stefano Franz
0f3453d1c7
add configuration option to enable compatibility zone whilst running devMode
* add configuration option to enable compatibility zone whilst running devMode

* add documentation about allowCompatibilityZone

* address review comments

* remove extra doc lines

* add changelog entry

* Update changelog.rst
2018-06-12 11:03:32 +01:00