92cf91c0b0
Merge pull request #159 from corda/aslemmer-multi-threaded-sm
...
Multi-threaded SMM
2018-02-01 14:24:17 +00:00
dca8699e7c
set network registration poll interval via http cache control header ( #434 )
...
* set network registration poll interval via http cache control header from the server side
* default poll interval to 10 seconds if cache header not found
* address PR issues
* address PR issues
2018-02-01 13:38:25 +00:00
b71f0c49fb
Multi threaded state machine
2018-01-31 18:13:25 +00:00
7f58afc7ca
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180131
2018-01-31 10:37:44 +00:00
ceff50d656
Refactor location of bridge code to allow out of process bridging ( #2431 )
...
Fix some issues Andras has seen
2018-01-30 16:29:59 +00:00
1c77736d50
merge os to enterprise
2018-01-30 14:00:22 +00:00
1ecf646f7e
Oracle 11xe and 12c database compatibility ( #206 )
...
* Sql setup scripts for Oracle and datasource configuration.
* CashSelection for Oracle.
* Workaround of forbidden distinct for BLOBs.
* ojdbc8.jar driver dependency from Oracle Maven repository, ojdbc6.jar from lib (it's not in Maven repo).
* allow to use random Port in node names and trim it from schema name, remove schema with port numbers from db setup (to cater for new test, non Oracle specific change)
* Removed unnecessary code from ConfigUtilities (non Oracle specific change)
* Removed db integration tests setup for RPCStabilityTest as it doesn't start any nodes
2018-01-29 18:35:58 +00:00
685ab4c9b0
Add trace logging to network map client ( #2424 )
...
* Add trace logging to network map client
* Add trace logging to network map client
* address PR issue
* address PR issue
2018-01-29 17:44:28 +00:00
28e29c0873
Fix path issue which causes windows build failure. ( #2430 )
2018-01-29 17:43:48 +00:00
93054a9590
Add cmdline option for network root truststore and password ( #2407 )
...
* add cmdline option for network root truststore and password, instead of using node's truststore configuration to avoid confusion.
* revert line auto format
* fix failing integration test
* address PR issue
2018-01-29 13:43:16 +00:00
e19f51d9ac
CORDA-959 Filter unschedules and remove database activity from inside mutex. ( #2426 )
...
* Filter unschedules and remove database activity from inside mutex.
* Race condition fix
* Bug fix
2018-01-26 17:44:42 +00:00
054c44d4bc
Merge from OS to ENT including Bridge manager work
2018-01-26 16:55:43 +00:00
4257891c98
Revert "Raft Notary: remove snapshotting" ( #2423 )
...
This reverts commit cf33be66ff
2018-01-26 16:23:59 +00:00
881379b889
Merge branch 'master' into shams-os-merge-250118
2018-01-26 13:45:21 +00:00
336aeb96e5
Merge fixes
2018-01-26 13:45:03 +00:00
e357a88181
Deprecate TimeWindowChecker, make TimeWindowInvalid report exact current time and transaction time window ( #2280 )
...
* Make notary service return the current time and the transaction time window
along with the TimeWindowInvalid error.
Deprecate TimeWindowChecker.
Add a static method for validating transaction time window to reduce code duplication.
2018-01-26 09:32:11 +00:00
3be30af161
[ENT-1363] DB integration test fixes ( #411 )
...
Dependencies on JDBC drivers in 'node' need to be marked as 'runtime' instead of 'integrationTestRuntimeOnly', to make them available to integration tests in other projects.
2018-01-25 18:32:34 +00:00
0ff9c9e2e3
Move to message based bridge control protocol ( #2410 )
...
Tidy up
Remove dead RPCSecurity logic from ArtemisMessageServer
Address PR comments
Address PR comments
2018-01-25 17:53:34 +00:00
4b86362391
Merge remote-tracking branch 'open/master' into shams-os-merge-250118
...
# Conflicts:
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
# core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java
# docs/source/changelog.rst
# docs/source/corda-configuration-file.rst
# docs/source/upgrade-notes.rst
# finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
# finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
# gradle/wrapper/gradle-wrapper.properties
# node-api/src/main/kotlin/net/corda/nodeapi/internal/KeyStoreConfigHelpers.kt
# node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/resources/reference.conf
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/network/NetworkMapCacheTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/network-visualiser/src/main/kotlin/net/corda/netmap/NetworkMapVisualiser.kt
# samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/TestNodeInfoBuilder.kt
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-01-25 17:51:13 +00:00
242d9cf7ad
CORDA-692 Don't include internal packages in API documentation ( #2415 )
...
* Use G1 for gradle daemon
2018-01-25 15:26:13 +00:00
9783f11ba8
Exposed RPC SSL settings through Cordformation ( #2419 )
2018-01-25 14:32:58 +00:00
1be4f0950d
Remove compile time dependency on JDBC drivers [ENT-1363] ( #387 )
...
* Change JDBC drivers dependencies to integrationTestRuntimeOnly
* Added smoke test validating JDBC driver registration located in "./plugins" directory
* Some docsite tweaks
2018-01-25 13:38:51 +00:00
5f8af818b1
Merge pull request #2408 from corda/jamesbr-remove-jolokia-war
...
Remove jolokia war reference from webserver
2018-01-24 21:19:50 +00:00
0fa6969d5d
Added various X509 utilities to remove some of the existing boilerplate. ( #2416 )
2018-01-24 18:07:29 +00:00
cfb8997f23
Fix build break due to an API change between PR check and merge
2018-01-24 17:14:03 +01:00
d17670c747
Provide an API to register callback on app shutdown ( #2402 )
...
Provide an API to register callback on app shutdown.
2018-01-24 16:19:24 +01:00
3c0e006456
Reverted incorrect additional advertised RPC address in NodeInfo ( #2417 )
2018-01-24 14:42:07 +00:00
cef1f9885c
ENT-1282: create standalone db migration tool ( #356 )
...
* ENT-1282: add standalone db migration tool that works with both the node and the doorman
* ENT-1282: remove cmd line args during node startup
* ENT-1282: more clear message
* ENT-1282: fix integration test
* ENT-1282: more fixes and cleanup code
* ENT-1282: address PR comments
* ENT-1282: more fixes and refactoring
* ENT-1282: more classloader fixes
* ENT-1282: changes after demo feedback
* ENT-1282: update API
* ENT-1282: update documentation
* ENT-1282: formatting
* ENT-1282: added CONSOLE option for dry-run and logging
* ENT-1282: documentation changes
* ENT-1282: remove getMigrationResource from the public API
* ENT-1282: removed dependency on network-manager, added release-lock
* ENT-1282: Update documentation
2018-01-24 11:55:43 +00:00
61c7de22d6
Replaced KeyStoreWrapper with X509KeyStore, which is still a wrapper but assumes only X509 certs and has better APIs ( #2411 )
2018-01-24 07:51:55 +00:00
5df50c0e81
Fixes a bug in the deserialisation of UniqueIdentifiers in the CRaSH shell.
2018-01-23 17:28:24 +00:00
a564c9bfd3
Notary metrics ( #383 )
...
* Track the distribution of the number of input states
* Log number of input states and commit duration
...and move the rollback
* Update schema
2018-01-23 16:24:51 +00:00
142f52fa82
[CORDA:936]: Enable RPC layer to work with SSL
2018-01-23 16:23:37 +00:00
c81e597199
Fix liquibase files after node split ( #393 )
2018-01-23 15:06:21 +00:00
d2795954cb
Merge pull request #379 from corda/colljos-schema-split-for-notaries
...
CORDA-917 Bootstrap nodes without Notary schemas
2018-01-23 09:16:39 +00:00
013ac82dde
ENT-1412 flow state machine metrics ( #390 )
...
* re-add metrics for flows started, flows finished and checkpoint rate
Add metric for checkpoint volume rate.
* Put error and success counters in FlowStateMachine
* Optional graphite metrics writer
* Improved checkpoint volume metrics.
* Code review: Clean up/layout.
* Code review: spelling
2018-01-23 09:15:09 +00:00
8de2c78dd2
Remove jolokia war reference from webserver
2018-01-22 16:21:28 +00:00
00a7172e4b
Resolve conflict after merge from master.
2018-01-22 14:39:29 +00:00
4bff002b41
Merge branch 'master' into colljos-schema-split-for-notaries
2018-01-22 14:36:27 +00:00
8d5611853a
CORDA-929 Attachment caching ( #2372 )
...
* ENT-1403 Cache node attachments (and attachment content)
* ENT-1403 Make cache sizes configurable
* Update documentation with new config parameters
* Test that non-existence of attachments is not cached
* Remove unneeded defaults in interface
* It turned out we need the defaults on the interface in quite a few tests
* Codereview: typos, size in MB rather than bytes, charset in tests, move concurrencyLevel to a constant
* Codereview: Make the internal config value bytes again, but config file in MB
* Fix example config unit test
2018-01-22 13:41:06 +00:00
1fc646cfa8
CORDA-716 Move test-utils and node-driver to stable API section in docs ( #2335 )
...
* Move test-utils and node-driver to stable section.
* Move FlowStackSnapshotFactory to testing.services package & update docs
* Move SerializationTestHelpers to testing.core package
* Move TestConstants.kt to core namespace
* Move Expect.kt to core namespace
* Move CoreTestUtils to core.TestUtils - rename class and update imports
* Added some clarification to documents after re-reading them
* Added static imports
* Removing unused import
* Fix merge conflict
* Fixing merge conflict
2018-01-22 11:28:41 +00:00
f59560bb06
Database schema changes. ( #2389 )
...
Changes compatible with R3.Corda (ENT-794):
1) Added Hibernate corda-wrapper-binary two to to columns.
2) Shorten names of tables in dummy schemas used in tests.
3) Undo removal of compound index of VaultTxnNote (b423fea
2018-01-19 17:09:02 +00:00
ac7637e2b4
Revert "CORDA-599 RPCSecurityManager is no longer lateinit ( #2347 )"
...
This reverts commit 75e74e67a1
2018-01-19 17:52:59 +01:00
6ddf684846
Fix compile errors.
2018-01-19 15:12:33 +00:00
bd342a690c
Merge commit 'bbcafca959b2d468a6f4f9bb847a1bbb7bfc9fdc' into andr3ej-os-merges
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
2018-01-19 13:46:27 +00:00
7ac1cbd379
Merge commit 'e699dad076fc1d81b8bd9529747e2922728ce2e0' into andr3ej-os-merges
...
# Conflicts:
# node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
# node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt
2018-01-19 13:40:16 +00:00
de4c062529
Node restarted with shutdown executor ( #2391 )
...
* Test for node restart
* Executor gets shutdown on stop, make sure we have one on start
* Reset shutdown otherwise AbstractNode.stop never gets called
2018-01-19 10:19:12 +00:00
5dc15b8032
Merge pull request #381 from corda/andr3ej-matthew-os-merge
...
Matthew OS merge
2018-01-19 08:52:57 +00:00
f3c5ae2ff6
Merge commit '6edf95506bb2bd96ebffade9b9dd82d468cd4252' into enterprise
...
# Conflicts:
# docs/source/changelog.rst
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
2018-01-18 16:48:05 +00:00
e9f0c8eca8
Merge pull request #361 from corda/thomas-mysql-reconnect
...
Retry obtaining DB connection
2018-01-18 16:38:47 +00:00
133cf13674
Remove primary key constraint on host and port ( #336 )
...
* Remove primary key constraint on DBHostAndPort
* Update migration file
2018-01-18 16:24:06 +00:00
