Commit Graph

9665 Commits

Author SHA1 Message Date
70f1ea0a9d ENT-5258 db schema set-up only via command line flag (#6280)
Removing the ability to initialise schema from the node config, and add a new sub-command to initialise the schema (that does not do anything else and exits afterwards).
Also adding a command line flag that allow app schema to be maintained by hibernate for legacy cordapps, tests or rapid development.
Patching up mock net and driver test frameworks so they create the required schemas for tests to work, defaulting schema migration and hibernate schema management to true to match pre-existing behaviour.
Modified network bootstrapper to run an initial schema set-up so it can register nodes.
2020-05-22 16:27:10 +01:00
61d9dd0bb1 Merge branch 'release/os/4.3' into nnagy-os-4.3-os-4.4-20200522 2020-05-22 15:33:58 +01:00
8a0916b2a2 Merge pull request #6279 from corda/christians/update-fb-from-4.6
Update db changes feature branch with latest from 4.6
2020-05-22 15:04:48 +01:00
57b1a5e0fc ENT-5339 Failing tests against Oracle in VaultObserverExceptionTest (#6275)
* Fix erroneous sql statement for oracle; It was failing tests with 'ORA-00933: SQL command not properly ended'

* Fixed flaky test; it didn't wait for counter party flow to get hospitalized as the test implied
2020-05-22 10:15:51 +01:00
8e74eea607 CORDA-3587 - adding kdocs for current behaviour of VaultQueryCriteria (#6242)
* adding kdocs for current behaviour of VaultQueryCriteria

* improving the kdocs

* address PR comments
2020-05-21 13:26:55 +01:00
67298eb780 Merge pull request #6270 from corda/nnagy-os-4.5-os-4.6-20200520
Nnagy os 4.5 os 4.6 20200520
2020-05-21 13:19:58 +01:00
31612901cf CORDA-3800: Flaky ProtonWrapperTests test investigation (#6258) 2020-05-21 12:33:56 +01:00
326afacedb improved interactive shell flow lookup logic (#6271)
the current logic when a user type
```
flow start SomeFlow
```
is to search for the string `SomeFlow` in all registered flow names, if there is at exactly flow that ends with that string, it will be selected,
if there is more than one, the first in aphabetical order will be selected. If there are multiple flows that contains the string but no one that ends with it, it is considered ambiguous,
if there is exactly one containing the string it is instead selected (it doesn't matter whether it ends or not with it). All other cases are considered errors.
The goal of this change is to address the case where the node contains

```
net.corda.cordappp.AnotherSomeFlow
net.corda.cordappp.ImprovedSomeFlow
net.corda.cordappp.SomeFlow
```

typing
```
flow start SomeFlow
```
currently results in running `net.corda.cordappp.AnotherSomeFlow` because it comes first in alphabetical order, while `net.corda.cordappp.SomeFlow` is a better matches because the input substring
matches a bigger portion of the full flow name
2020-05-21 09:27:13 +01:00
e34930f9a8 [INFRA-351] Jenkinsfile for code check jobs (#6272) 2020-05-20 22:07:04 +01:00
301fc9f928 Merge branch 'release/os/4.5' into nnagy-os-4.5-os-4.6-20200520 2020-05-20 10:38:45 +01:00
5d481523bf INFRA-350 add suffix to the jdk 11 image to avoid overwrite (#6269) 2020-05-19 18:47:54 +01:00
d65568db86 [NOTICK] Remove obsolete on-demand smoke test Jenkins configuration (#6265) 2020-05-19 18:46:23 +01:00
ed9b0ff228 INFRA-350 add suffix to the jdk 11 image to avoid overwrite (#6268) 2020-05-19 18:33:54 +01:00
938d038c97 ENT-5278 - add missed checks for empty lists (#6261)
* add missed checks for empty lists

* adding missing brackets

* adding missing timeout
2020-05-19 16:55:09 +01:00
36a11e868a NOTICK Fix timing issue in FlowIsKilledTest (#6264)
Also remove `Configurator` that seems to fail on some agents.
2020-05-19 16:54:34 +01:00
eb52de1b40 CORDA-3490 Add option to start node without starting checkpointed flows (#6136)
Added command-line option: `--pause-all-flows` to the Node to control this.
This mode causes all checkpoints to be set to status PAUSED when the
state machine starts up (in StartMode.Safe mode). 

Changed the state machine so that PAUSED checkpoints are loaded into
memory (the checkpoint is deserialised but the flow state is left serialised)
but not started.

Messages from peers are queued whilst the flow is paused and processed
once the flow is resumed.
2020-05-19 16:27:41 +01:00
cc8ce3ca99 empty list checks (#6262) 2020-05-19 14:04:19 +01:00
fc2bb2ed4e EG-2116 - Add aliases for version attribute errors (#6260) 2020-05-19 11:53:29 +01:00
862de46c5b INFRA-331 Improving Jenkins PR build performance (#6252)
* INFRA-331 increasing shard number and reintroducing pre allocation

* INFRA-331 removing preallocation

* INFRA-331 reintroducing preallocation as it cuts 10 mins from the build

* INFRA-331 test performance with 20 pods

* INFRA-331 test performance with 10 pods and preallocation

* INFRA-331 more tests on 15 pods + prealloc
2020-05-19 09:57:20 +01:00
ac03ba63e8 Merge pull request #6254 from corda/adel/merge-from-4.5
Adel/merge from 4.5
2020-05-15 15:38:46 +01:00
b9b0ca58e3 Merge remote-tracking branch 'origin/release/os/4.5' into adel/merge-from-4.5 2020-05-15 10:23:17 +01:00
6dd72ac079 ENT-5275: Replace hardcoded platform versions with descriptive values (#6236)
* ENT-5275: Replace hardcoded platform versions with descriptive values

* PR updates

* missed versions

* missed versions

* fix

* add FIRST_VERSION
2020-05-14 14:43:52 +01:00
06467d04b1 EG-1980 - Remove stale docs links from OS (#6251)
Remove hardcoded docs references, push docs link to gradle
2020-05-14 12:57:59 +01:00
8387e99535 [NOTICK]: Do not use Security.addProvider(BouncyCastleProvider()) in tests to avoid disruptions of other tests (#6250) 2020-05-14 10:53:54 +01:00
5db44790d7 disableConcurrentBuilds 2020-05-13 17:10:46 +01:00
4edf618442 remove throttling 2020-05-13 16:39:55 +01:00
bd657fad65 Merge pull request #6245 from corda/EG-1991-ConfigHelper-update
EG-1991 Ignore warning for CORDA environment variables in all caps
2020-05-13 15:37:42 +01:00
c2ac22a41f NOTICK Non-database error handling in withEntityManager (#6239)
When a non-database exception is thrown out of a `withEntityManager`
block, always check if the session needs to be rolled back.

This means if a database error is caught and a new non-database error is
thrown out of the `withEntityManager` block, the transaction is still
rolled back. The flow can then continue progressing as normal.
2020-05-13 15:17:51 +01:00
74080e7cb6 CORDA-3772: Now specify source and target of 8 when compiling contract classes. (#6249) 2020-05-13 15:11:25 +01:00
febb5a44b7 Added comment 2020-05-13 21:55:04 +08:00
fd272125cf Merge pull request #6235 from corda/nnagy-os-4.5-os-4.6-20200512
Nnagy os 4.5 os 4.6 20200512
2020-05-13 13:48:11 +01:00
9caf6538ce ENT-5298: Increase timeout by two minutes because the test occasionally takes longer than five minutes (#6246) 2020-05-13 13:15:05 +01:00
c3ea2c1470 Ignore warning for CORDA environment variables in all caps 2020-05-13 09:51:35 +08:00
fbf0bd9bd9 Upgrade ClassGraph to 4.8.78 (#6237) 2020-05-12 13:23:38 +01:00
c5950d6a3a ENT-5277: Reflect node-api changes in OS (#6238) 2020-05-12 13:22:30 +01:00
52e3030d60 Merge branch 'release/os/4.5' into nnagy-os-4.5-os-4.6-20200512 2020-05-12 10:26:43 +01:00
356172c370 Merge pull request #6220 from corda/dan/4.6-into-checkpoint-feature-branch-2020-05-05
Merge 4.6 into checkpoint feature branch 2020-05-05
2020-05-12 10:18:59 +01:00
3ced611031 CORDA-3730: Remove unused feature. (#6234) 2020-05-12 09:52:32 +01:00
1547efb093 CORDA-3755: Switched attachments map to a WeakHashMap (#6214)
* Bump OS release version 4.6

* CORDA-3755: Switched attachments map to a WeakHashMap

* CORDA-3755: Added explicit strong references to map key.

* CORDA-3755: Keeping detekt happy.

* CORDA-3755: Test a gc in verify.

* CORDA-3755: Making detekt happy.

* CORDA-3755: Suppress warnings for weak reference test.

* CORDA-3755: Fixing build failure with attachments.

* CORDA-3755: Rewrite based on Ricks input - now handles attachment already existing in map!

* CORDA-3755: Refactor WeakReference behaviour into AttachmentsHolderImpl and provide alternate version of this class for core-deterministic.

* CORDA-3755: Added more tests for WeakHashMap.

* CORDA-3755: Ignore the tests using System.gc keep for local testing only

* CORDA-3755: Adding comment to explain the ignored tests.

* Make AttachmentsHolderImpl package-private inside core-deterministic, just like it is inside core.

* CORDA-3755: Update assertions following review comments.

* CORDA-3755: Removing import

* CORDA-3755: Removed unused var.

* CORDA-3755: Reverting files that somehow got changed in rebase.

Co-authored-by: nargas-ritu <ritu.gupta@r3.com>
Co-authored-by: Chris Rankin <chris.rankin@r3.com>
2020-05-12 09:51:12 +01:00
308b31c3fe Merge pull request #6233 from corda/nnagy-os-4.4-os-4.5-20200511
Nnagy os 4.4 os 4.5 20200511
2020-05-11 17:52:02 +01:00
d4cb0e2d87 Merge pull request #6232 from corda/rfowler-os-4.5-os-4.6-20200511
Rfowler os 4.5 os 4.6 20200511
2020-05-11 17:51:21 +01:00
e0b5319515 Merge branch 'release/os/4.4' into nnagy-os-4.4-os-4.5-20200511 2020-05-11 16:32:53 +01:00
ddc49babed EG-441 - Update properties files after docs review (#6223)
* Update properties files after docs review
* Cosmetic changes to properties files
2020-05-11 16:10:38 +01:00
c8d3d22841 Merge branch 'release/os/4.5' into rfowler-os-4.5-os-4.6-20200511 2020-05-11 15:42:46 +01:00
350066d386 fix for handling empty lists in vault query (#6231) 2020-05-11 15:41:50 +01:00
6f6081615a CORDA-3768: Upgrade to Corda Gradle Plugins 5.0.9. (#6222) 2020-05-11 15:41:11 +01:00
b43e781f27 ENT-5285, ENT-5296 Ignore ForkJoinPool.commonPool threads in RPCStabilityTests (#6205)
* NOTICK Ignore JUnit time threads in `RPCStabilityTests`

* NOTICK - Ignore ForkJoinPool.commonPool as it's not related to our test

Co-authored-by: LankyDan <danknewton@hotmail.com>
2020-05-11 15:38:23 +01:00
bb2aef554e Merge branch 'release/os/4.5' into rfowler-os-4.5-os-4.6-20200511 2020-05-11 15:02:20 +01:00
6afd443e3a Merge pull request #6230 from corda/rfowler-os-4.4-os-4.5-20200511
Rfowler os 4.4 os 4.5 20200511
2020-05-11 14:51:08 +01:00
5f8cceae45 Merge branch 'release/os/4.4' into rfowler-os-4.4-os-4.5-20200511 2020-05-11 11:40:09 +01:00