ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-23 04:25:19 +00:00
Code Issues Actions2 Packages Projects Releases Wiki Activity
12,231 Commits 100 Branches 407 Tags
b09a57d768
Commit Graph

2353 Commits

Author SHA1 Message Date
Tudor Malene
c81e597199
Fix liquibase files after node split () 2018-01-23 15:06:21 +00:00
josecoll
d2795954cb
Merge pull request from corda/colljos-schema-split-for-notaries 
CORDA-917 Bootstrap nodes without Notary schemas
 2018-01-23 09:16:39 +00:00
Christian Sailer
013ac82dde
ENT-1412 flow state machine metrics () 
* 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
James Brown
8de2c78dd2 Remove jolokia war reference from webserver 2018-01-22 16:21:28 +00:00
josecoll
00a7172e4b Resolve conflict after merge from master. 2018-01-22 14:39:29 +00:00
josecoll
4bff002b41 Merge branch 'master' into colljos-schema-split-for-notaries 2018-01-22 14:36:27 +00:00
Christian Sailer
8d5611853a
CORDA-929 Attachment caching () 
* 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
Andrzej Cichocki
1fc646cfa8 CORDA-716 Move test-utils and node-driver to stable API section in docs () 
* 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
szymonsztuka
f59560bb06
Database schema changes. () 
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).
4) Assertions for 2 vault tests don't rely on order of rows.
 2018-01-19 17:09:02 +00:00
Mike Hearn
ac7637e2b4 Revert "CORDA-599 RPCSecurityManager is no longer lateinit ()" 
This reverts commit 75e74e67a1b589cbfa443fb8f05e625233bef78b.
 2018-01-19 17:52:59 +01:00
Andrzej Cichocki
6ddf684846
Fix compile errors. 2018-01-19 15:12:33 +00:00
Andrzej Cichocki
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
Andrzej Cichocki
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
cburlinchon
de4c062529
Node restarted with shutdown executor () 
* 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
Matthew Nesbit
5dc15b8032
Merge pull request from corda/andr3ej-matthew-os-merge 
Matthew OS merge
 2018-01-19 08:52:57 +00:00
Andrzej Cichocki
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
Thomas Schroeter
e9f0c8eca8
Merge pull request from corda/thomas-mysql-reconnect 
Retry obtaining DB connection
 2018-01-18 16:38:47 +00:00
Katarzyna Streich
133cf13674
Remove primary key constraint on host and port () 
* Remove primary key constraint on DBHostAndPort

* Update migration file
 2018-01-18 16:24:06 +00:00
Katarzyna Streich
af081a7170
Remove primary key constraint on DBHostAndPort () 
Remove primary key constraint on DBHostAndPort

Return always first node if more are matching by address.
 2018-01-18 16:23:41 +00:00
josecoll
a148835787 Added migrationResource for Notary schemas, and split out original liquibase node-services changelogs into node-core and node-notary 2018-01-18 15:21:55 +00:00
Andrzej Cichocki
42e1a38c6b
Merge commit 'ea57639a378fa45f0aef6930bc4450d0bbfaa5f4' into andr3ej-entbot 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
 2018-01-18 11:15:14 +00:00
Andrzej Cichocki
bbcafca959
Retire DatabaseTransactionManager. () 2018-01-18 10:11:34 +00:00
josecoll
e699dad076
CORDA-917 Bootstrap nodes without Notary schemas (by default) () 
* Default jolokia version with optional override in CorDapp project gradle file.

* Bootstrap a node without Notary schemas by default.

* Revert unrelated Jolokia code change.

* Revert unrelated Jolokia code change.

* Addressed PR review feedback.
 2018-01-18 10:10:06 +00:00
Christian Sailer
d9fb2ae4a8 Merge commit 'fca0afe5913d880628b9f94c459a04fb785b6c17' into christians/ENT-985-merge 2018-01-18 09:56:46 +00:00
Shams Asari
d19eb4a9d7
Removed useHTTPS from NodeConfiguration as it's not needed by the node. () 
It's still expected to be present in node.conf if the web server needs to use SSL.
 2018-01-17 17:47:40 +00:00
Matthew Nesbit
6edf95506b
Rename the inbox () 
Add changelog entry

Address review comments

Alternate solution to service queues

Fixup after merge
 2018-01-17 16:06:31 +00:00
Thomas Schroeter
f52be47b48 Retry obtaining DB connection 2018-01-17 14:23:15 +00:00
Andrzej Cichocki
ea57639a37
CORDA-924 Fix IntegrationTestingTutorial () 
i.e. H2 startup bug. also:
* Fix poor connection pool discipline
* Log cleanup failures instead of replacing foreground failure
 2018-01-17 14:23:13 +00:00
Christian Sailer
fca0afe591
CORDA-928 Caching in the NetworkMapCache () 
* CORDA-928 cache query results via `getPeerByLegalName` and `getNodesByIndentityKey` to avoid hitting the DB hard in RPC handling.

* Skip cache invalidation during init() - caches are still null.

* Remove registeredNodes/partyNodes caching of data feed.
Rewrite data feed to be initialised off the DB.
Add start method to trigger readyness/artemis listeners if there are nodes in the DB.

* Invalidate cache last rather than first when updating
 2018-01-16 21:15:15 +00:00
bpaunescu
52a6abefb5
Merge pull request from corda/bogdan-date-to-localdatetime 
replace java.Date with java.time
 2018-01-16 19:53:08 +00:00
josecoll
eb9a51af75 Merge branch 'master' into colljos-merge-release3-dp-master 2018-01-16 14:28:07 +00:00
josecoll
42b4b80545 Fixed imports 2018-01-16 13:24:53 +00:00
josecoll
eb3798da5e Merge remote-tracking branch 'open/master' into colljos-merge-160118 2018-01-16 12:13:49 +00:00
josecoll
24bf6df868 Merge branch 'master' into colljos-merge-release3-dp-master 2018-01-16 09:58:51 +00:00
Anthony Keenan
1367cd4adb
CORDA-912 Stop exposing internal node user, create user in testing infrastructu… () 
* Stop exposing internal node user, create user in testing infrastructure instead

* Update kdocs
 2018-01-15 19:30:33 +00:00
Andrzej Cichocki
75e74e67a1
CORDA-599 RPCSecurityManager is no longer lateinit () 2018-01-15 19:11:00 +00:00
Shams Asari
7cdacb0142 Merge branch 'master' into shams-os-merge-120118 2018-01-15 15:23:27 +00:00
Christian Sailer
5e7d2f00ae
ENT-1389 Modify the HibernateObserver to persist states by schema (and only create a session per schema, not one per state per schema) () 2018-01-15 15:19:32 +00:00
Christian Sailer
df195b20bd
ENT-1383 Memory weight based transaction cache () 
* ENT-1383 Make the transaction cache in DBTransactionStorage memory-weight based (rather than count based) so large transactions can no longer use an undue amount of memory.

* Code review: formatting and legibility

* Fix stupid type cast error

* More formatting
 2018-01-15 13:48:55 +00:00
josecoll
120500646c Minor reverts requested by Shams. 2018-01-15 11:54:24 +00:00
igor nitto
2082168cf7
Close Hikari CP around external auth database on shutdown (RPCSecurityManagerImpl.kt) () 2018-01-15 09:57:44 +00:00
Andrius Dagys
fb1d3087de Raft notaries can share a single key pair for the service identity (in contrast to a shared composite public key, and individual signing key pairs). This allows adjusting the cluster size on the fly. 2018-01-13 16:36:41 +00:00
josecoll
729aa65e7f Merge from R3 Corda 3.0 Dev Preview release branch to master 2018-01-13 11:00:01 +00:00
Andrius Dagys
7311111c9c
Re-enable notary idempotence test () 
* Re-enable notary idempotence test
 2018-01-12 20:25:49 +00:00
Tudor Malene
4b3a77b5cb
attempt to fix db integration tests () 2018-01-12 18:38:20 +00:00
Andrius Dagys
219d6f8b12 Un-ignore several integration tests 2018-01-12 18:19:02 +00:00
Tudor Malene
e7cc38cf1b
ENT-1330: Liquibase migration generation tool () 
* [ENT-1330]: Tool to generate migration files for CorDapps

* [ENT-1330]: cleanups

* [ENT-1330]: cleanups

* [ENT-1330]: added test to check if a migration file is properly generated and picked up
 2018-01-12 09:53:42 +00:00
Shams Asari
c71ef3139b Merge remote-tracking branch 'open/master' into shams-os-merge-120118 
# Conflicts:
#	core/src/main/kotlin/net/corda/core/schemas/CommonSchema.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkMap.kt
#	node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/internal/vault/DummyDealStateSchemaV1.kt
 2018-01-12 08:06:44 +00:00
Shams Asari
bbfbb08c43
CORDA-881: Signed network parameters has the network map cert attached to it instead of just the public key. () 
Introduced DigitalSignatureWithCert and SignedDataWithCert as internal APIs, with the expectation that they will become public; renamed the network parameters end-point to network-parameters; updated the network-map.rst doc; and did some refactoring.
 2018-01-12 07:59:08 +00:00
Christian Sailer
0c017fdfec
ENT-1361 Enforce Unicode settings for SQL server () () 
* Enforce Unicode settings for SQL server ()

* Enforce correct unicode setting in the JDBC Url for SQL server

* Avoid cast/null check

* Fixed wrong string literal and added test to check the literal matches what Hikari expects

* Optimise Imports

* Constant for config tag and minor test improvement.

* Constant and case insensitive check

* Import and Capitalisation

* Missed curly brace
 2018-01-11 14:29:46 +00:00