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
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
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
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
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
23e4f4cb6f
Fix merge conflicts
2018-03-26 15:52:00 +01:00
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
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
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
7978910e0b
ENT-1633 increase node max heap size to 512m ( #2851 )
2018-03-26 13:41:37 +01:00
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
0b692d7482
Refactored as per code review comments.
2018-03-23 13:27:28 +00:00
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
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
975b81c2c4
[CORDA-1243]: Avoid drain-related deadlocks between 2 nodes. ( #2866 )
2018-03-23 11:45:19 +00:00
7f2a056c45
Merge cleanup
2018-03-22 14:21:04 +00:00
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
620ba1e8a2
Integration test for network parameter updates and improved logging ( #2863 )
2018-03-22 14:08:07 +00:00
7ce8d7a878
SUBMISSION - Remove repeated code ( #2864 )
2018-03-22 13:45:02 +00:00
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
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
34d5f72f51
Merge pull request #591 from corda/aslemmer-ENT-1647
...
ENT-1647: Ack duplicate messages
2018-03-21 18:45:09 +00:00
88d7f7f720
Fix
2018-03-21 16:35:34 +00:00
dc076f83ba
Merge remote-tracking branch 'open/master' into merges/march-21-16-24
2018-03-21 16:30:31 +00:00
051583b4f5
Remove spurious session rollback
2018-03-21 15:32:11 +00:00
8371a65ed8
ENT-1673 Created reusable "createDatasourceFromDriverJars" function
2018-03-21 15:32:07 +00:00
9f0ef0157e
ACK duplicate messages
2018-03-21 15:31:54 +00:00
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
3db40bb392
CORDA-1208: MySQL notary service - store request signature
2018-03-21 14:38:20 +00:00
91cda5f18a
Reintroduce accidentally removed RPC addresses print ( #2857 ) [CORDA-1244]
2018-03-21 14:21:09 +00:00
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
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
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
ce8771900e
[CORDA-1235]: Prevent out of order consumption of initiation vs subsequent messages ( #2850 )
2018-03-21 11:24:53 +00:00
785891515e
Merge pull request #588 from corda/merges/ENT-1634
...
Merge OS -> ENT
2018-03-21 11:04:40 +00:00
b81c005230
Merge OS -> ENT
2018-03-21 09:53:28 +00:00
614d2049ec
ENT-1625 Fix overly large footprint of checkpoint bandwidth histogram ( #580 )
...
* Upgrade metrics library and histogram implementation
* Only write to the "per second" checkpoint bandwidth histogram once per second, maximum.
* Bug fix
* Review feedback and fix unit test
* Fix IRS demo to use specific metrics version in spring boot
2018-03-21 09:52:29 +00:00
f1ac3c39e9
ENT-1634 Fix Primary Key generation for node_notary_request_log table ( #2855 )
...
Don't assign a value as it's auto generated, remove redundant default value for GeneratedValue strategy.
2018-03-21 09:41:50 +00:00
5def901980
[ENT-1639] Add version column ( #585 )
...
* Add `version` column
The equality check of the timestamp was tricky to get right. Better to
use a logical timestamp.
2018-03-20 19:08:23 +00:00
8ed6c556e4
Add copyright to new bridge files
2018-03-20 10:07:08 +00:00
9fff66257b
Merge pull request #569 from corda/mnesbit-socks-proxy-support
...
ENT-1614: Add SOCKS proxy capability to the AMQP Bridges
2018-03-20 09:06:06 +00:00
8a561cddbf
Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41
...
# Conflicts:
# client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
# node/src/main/java/CordaCaplet.java
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-03-19 15:17:49 +00:00
8591ae2dc9
CordApps back in node classpath ( #2843 ) [CORDA-1232]
2018-03-19 14:34:02 +00:00
7a077e76f0
CORDA-1099: Orchestrated clean shutdown from Shell ( #2831 )
2018-03-19 14:20:10 +00:00
327d7d8acf
Added sign helper method to CertificateAndKeyPair for producing SignedDataWithCert objects ( #2841 )
2018-03-19 12:47:23 +00:00
6885661b66
Initial cut of SOCKS proxy support
...
Correct the reconnect logic when SOCKS proxy is in the pipeline
Add integration tests and adjust handling of reconnect
Rename parameter
2018-03-19 11:37:46 +00:00
fef30e49a8
Merge pull request #576 from corda/merges/1 2018-03-16
...
Merge OS to Enterprise.
2018-03-19 08:18:40 +00:00
c4dc8accde
Merge remote-tracking branch 'remotes/opensource/master' into merges/1
2018-03-16 17:52:01 +00:00
dc595792e7
github issue #2630 : missing rpc info at node startup ( #2839 )
2018-03-16 17:14:25 +00:00
bb2643cf2e
Add hard restart test
...
Remove default async db flush
Add in-memory P2P deduplication until we commit the ID persisting tx
Add some explaining comments
Make scheduled state kickoffs atomic with flow starts
2018-03-16 15:43:20 +00:00
