ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-29 09:18:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,347 Commits 91 Branches 405 Tags 354 MiB
89ecfb96c5
Commit Graph

2008 Commits

Author SHA1 Message Date
sollecitom
89ecfb96c5 Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11 2018-03-29 13:12:00 +01:00
Michele Sollecito
0d1d7daedc
[CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. (#2892) 2018-03-29 13:01:41 +01:00
ags
ed9a31522b
Merge remote-tracking branch 'open/master' into ags_2018-03-29 2018-03-29 09:22:10 +01:00
Andrzej Grzesik
2863f8403b
CORDA-1277 Remove double quotes from keys in reference.conf 
CORDA-1277 Remove double quotes from keys in reference.conf
 2018-03-29 09:15:30 +01:00
Shams Asari
71baccf167 Merge remote-tracking branch 'open/master' into os-merge-d2b7f8b 2018-03-28 17:06:15 +01:00
Katarzyna Streich
d2b7f8b91f
ENT-1686: Improve error message on parameters mismatch (#2891) 
Improve error message on parameters mismatch
 2018-03-28 16:48:56 +01:00
ags
43ead64240
updating docs 2018-03-28 15:54:58 +01:00
Katarzyna Streich
2e4b223bd8
ENT-1668: Don't crash on node startup when network map is not available (#2887) 
Fix ENT-1668

Don't crash on node startup when network map is not available
 2018-03-28 15:42:39 +01:00
ags
51567e944d
detect quotes in config keys 2018-03-28 15:23:12 +01:00
Shams Asari
768dd32417
ENT-1663 - Inclusion of the cert path and root cert in the exception message when cert path validation fails. (#2890) 
Also, added check to node startup that --initial-registration cannot occur in devMode
 2018-03-28 15:18:50 +01:00
Andrius Dagys
447b41d936 MySQL notary service: improve database failover and exception handling. 
Transactions are now retried if a communication failure occurs during execute() or commit().
Note that this may result in duplicate entries in the notary request log, and false state
commit conflicts (the notary client would still receive a successful response).
We need to tidy this up in the future.
 2018-03-28 14:46:27 +01:00
ags
e60b816b19
double quotes in reference conf confuse people 2018-03-28 14:28:55 +01:00
Katelyn Baker
1baa89e9cb
Merge pull request #630 from corda/kat-merge-28-03-18 
Kat merge 28/03/18
 2018-03-28 13:50:17 +01:00
szymonsztuka
7370e6272e
Add support for database integration tests for DrainingMode tests (#607) 2018-03-28 12:49:09 +01:00
cburlinchon
4558651b58
ENT-1716 Documentation for hot cold ha (#628) 2018-03-28 11:44:07 +01:00
sollecitom
b93f12d413 Finished porting change to make JPA entities non-final and serializable. 2018-03-28 10:58:41 +01:00
Katelyn Baker
bc3605e8da Merge remote-tracking branch 'open/master' into kat-merge-28-03-18 2018-03-28 09:47:49 +01:00
Michele Sollecito
36f02ff4b4 [CORDA-1267]: Making Corda's JPA classes non-final and Serializable. (#2882) 
* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.
 2018-03-28 08:40:28 +01:00
szymonsztuka
94557c7b88 Merge remote-tracking branch 'remotes/opensource/master' into merges/drainingmode-integration-tests-27-03-2018 - fix compilation error 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
 2018-03-27 15:04:35 +01:00
szymonsztuka
097233478a Merge remote-tracking branch 'remotes/opensource/master' into merges/drainingmode-integration-tests-27-03-2018 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
 2018-03-27 14:11:36 +01:00
szymonsztuka
4269e4a02e
DrainingMode integration tests - explicit node names, changed column names of a test table. (#2879) 
Align DrainingMode integration tests (related to CORDA-1243) with Enterprise repo.
 2018-03-27 14:00:28 +01:00
Thomas Schroeter
f6e14b8d4d
Distributed notary setup fixes (#606) 
* MySQL notary is clustered notary

* Fix registration tool app class

* Allow config file without parent

* Fix `MySQLNotaryServiceTest`
 2018-03-27 13:03:46 +01:00
Anthony Keenan
23e4f4cb6f Fix merge conflicts 2018-03-26 15:52:00 +01:00
Anthony Keenan
7dbceaadcb Merge remote-tracking branch 'open/master' 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/events/NodeSchedulerService.kt
#	node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
 2018-03-26 15:46:26 +01:00
Anthony Keenan
329fa94a09
CORDA-1002 Add node scheduler persistence tests (#2860) 
* Add node scheduler persistence tests

* Kill the scheduler threads after node scheduler tests

* Address review comments
 2018-03-26 14:48:58 +01:00
tudor.malene@gmail.com
a01c9b41e1 Merge remote-tracking branch 'open/master' into merge/tudor-26-03 
# Conflicts:
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
 2018-03-26 14:07:28 +01:00
Tudor Malene
7978910e0b
ENT-1633 increase node max heap size to 512m (#2851) 2018-03-26 13:41:37 +01:00
szymonsztuka
a723472651
Fix notary column definition in Liquibase for Postgres (#596) 
Postgres doesn't support precision for INT/INTEGER and BIGINT.
 2018-03-23 15:10:19 +00:00
sollecitom
0b692d7482 Refactored as per code review comments. 2018-03-23 13:27:28 +00:00
sollecitom
4ce69e3ace Merge remote-tracking branch 'remotes/open/master' into merges/march-23-11-47 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/NodeStartAndStopTest.kt
#	node/src/integration-test/kotlin/net/corda/node/NodeStatePersistenceTests.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
 2018-03-23 12:17:34 +00:00
sollecitom
ca3ecb97cb Merge remote-tracking branch 'remotes/open/master' into merges/march-23-11-47 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/NodeStartAndStopTest.kt
#	node/src/integration-test/kotlin/net/corda/node/NodeStatePersistenceTests.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
 2018-03-23 12:17:00 +00:00
Michele Sollecito
975b81c2c4
[CORDA-1243]: Avoid drain-related deadlocks between 2 nodes. (#2866) 2018-03-23 11:45:19 +00:00
Shams Asari
7f2a056c45 Merge cleanup 2018-03-22 14:21:04 +00:00
Shams Asari
83367d5474 Merge remote-tracking branch 'open/master' into os-merge-620ba1e 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
 2018-03-22 14:13:50 +00:00
Shams Asari
620ba1e8a2
Integration test for network parameter updates and improved logging (#2863) 2018-03-22 14:08:07 +00:00
renlulu
7ce8d7a878 SUBMISSION - Remove repeated code (#2864) 2018-03-22 13:45:02 +00:00
Tudor Malene
72b97be42c
Merge pull request #587 from corda/feature/ENT-1637/migration-tool-changes 
ENT-1673 Update migration tool to use the drivers folder and created reusable "createDatasourceFromDriverJars" function
 2018-03-22 10:35:55 +00:00
Patrick Kuo
ff4bbaf63f ENT-1524 & ENT-1358: Cleaned up doorman db schema (#565) 
* Renamed tables and constraints to have name < 30 characters
* Using AttributeConverters were possible for custom types
* NodeInfoEntity has relationship to accepted NetworkParametersEntity, not the hash
* Improved logging in the node
 2018-03-22 06:39:02 +00:00
Andras Slemmer
34d5f72f51
Merge pull request #591 from corda/aslemmer-ENT-1647 
ENT-1647: Ack duplicate messages
 2018-03-21 18:45:09 +00:00
igor nitto
88d7f7f720 Fix 2018-03-21 16:35:34 +00:00
igor nitto
dc076f83ba Merge remote-tracking branch 'open/master' into merges/march-21-16-24 2018-03-21 16:30:31 +00:00
Andras Slemmer
051583b4f5 Remove spurious session rollback 2018-03-21 15:32:11 +00:00
Tudor Malene
8371a65ed8 ENT-1673 Created reusable "createDatasourceFromDriverJars" function 2018-03-21 15:32:07 +00:00
Andras Slemmer
9f0ef0157e ACK duplicate messages 2018-03-21 15:31:54 +00:00
Tudor Malene
50d9a7edb3
Merge pull request #589 from corda/merges/march-21-13-45 
Merges: March 21 13:45
 2018-03-21 15:01:11 +00:00
Andrius Dagys
3db40bb392 CORDA-1208: MySQL notary service - store request signature 2018-03-21 14:38:20 +00:00
igor nitto
91cda5f18a
Reintroduce accidentally removed RPC addresses print (#2857) [CORDA-1244] 2018-03-21 14:21:09 +00:00
sollecitom
3887838bc5 Merge remote-tracking branch 'remotes/open/master' into merges/march-21-13-45 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
 2018-03-21 13:51:07 +00:00
szymonsztuka
49146b1cb5
ENT-1634 Fix Primary Key generation for node_notary_request_log table - part 2 (#582) 
* Fix node_notary_request_log table - update Liquibase xml migration 
* (Unrelated to ENT-1634) Add database SQL setup for several tests to pass database integration tests, update SQL scripts for new  tables
 2018-03-21 13:49:25 +00:00
Katarzyna Streich
75b467e340 ENT-1433: Implementation of NetworkParameters updates (#477) 
* Implementation of NetworkParameters updates

Implementation of NetworkParameters updates for network-management
server side of the process.
Change the way network parameters are read up on network-management
startup. Introduced 3 flags to clearly communicate intentions:
initial-network-parameters, update-network-parameters and flag-day.

* Address Shams comments

* Address comments

* NetworkMapStorage refactor

getLatestNetworkParameters returns NetworkParametersEntity

* TODO Exit after parameters update

Started implementing feature requested by devops. TODO: Fix
NodeRegistrationTest

* Code cleanup

* Merged the two cmd line flags into one --set-network-parameters. The idea being to simply check if there are any active network parameters to determine if it's an update or not.

Applying network parameters causes the server to exit once done (ENT-1559).

* Merge fixes

* Minor cleanup

* Small fixes

* Merge fixes and cleanup

* TODO Implementation of cancelUpdate flag

Will slightly change after more manual testing

* Small cleanup

* Address comments

Add OneToOne relation between ParametersUpdate and NetworkParameters.

* Address comments fix tests
 2018-03-21 12:29:27 +00:00