5ecb36c302
Merge fix
2023-07-13 11:31:35 +01:00
3a6deeefa7
Merge branch 'release/os/4.9' into shams-4.10-merge-e6a80822
...
# Conflicts:
# .github/workflows/check-pr-title.yml
# .snyk
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPClientSslErrorsTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2023-07-13 10:53:30 +01:00
1e0f7cd690
Merge fix
2023-07-07 15:29:44 +01:00
671ce9ef97
Merge branch 'os-4.8-merge-point' into shams-4.9-merge-0b8536b9
...
# Conflicts:
# .github/workflows/check-pr-title.yml
# node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
2023-07-07 15:20:43 +01:00
0b8536b97c
Merge pull request #7395 from corda/shams-thread-names
...
ENT-10016: Give all node threads descriptive names
2023-06-09 16:05:48 +01:00
5b3180bf7b
ENT-10016: Give all node threads descriptive names
2023-06-09 11:17:26 +01:00
0bfce451ea
ENT-10013: Vault service refactoring backport
2023-06-06 16:17:58 +01:00
4dcd9245d3
ENT-9806: Using Artemis SSLContextFactory service to pass in custom TrustManagerFactory. This removes the need to copy code from NettyAcceptor.
2023-06-02 15:10:58 +01:00
5706f89639
Merge branch 'release/os/4.8' into shams-4.9-frwd-merge-a817218b
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
# node-api/src/test/kotlin/net/corda/nodeapi/internal/revocation/RevocationTest.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/artemis/BrokerJaasLoginModule.kt
# node/src/main/kotlin/net/corda/node/internal/artemis/CertificateChainCheckPolicy.kt
# node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt
# node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
2023-06-01 16:37:57 +01:00
a817218b08
ENT-9806: Added peer info to SSL handshake logging, and other changes for ENT merge ( #7380 )
2023-06-01 15:51:58 +01:00
e15f92b526
Merge pull request #7355 from corda/shams-crl-netty-threads-blocked
...
ENT-9806: Netty threads no longer blocked if CRL endpoints are unresponsive
2023-05-27 10:43:41 +01:00
c065021328
ENT-8827: The ordering of vault query results is clobbered by ServiceHub.loadStates
2023-05-18 15:59:25 +01:00
0cc3ffe1d6
ENT-9941: Moved new connector factory to node-api ( #7369 )
2023-05-16 08:45:01 +01:00
0a617097be
ENT-9806: Prevent Netty threads being blocked due to unresponsive CRL endpoints
2023-05-15 12:59:24 +01:00
a37d09486f
Merge branch 'release/os/4.9' into shams-4.10-fwrd-merge-7b7e3847
2023-05-15 09:55:31 +01:00
13ca00deea
ENT-9941: Moved new connector factory to node-api
2023-05-12 17:42:27 +01:00
151dc16a0e
Merge branch 'release/os/4.8' into shams-4.9-frwd-merge-31a34e5a
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
# node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
2023-05-12 14:34:33 +01:00
31a34e5a5c
ENT-9941: Improved Netty logging, especially of the embedded broker ( #7365 )
2023-05-12 10:11:09 +01:00
0951853207
ENT-6515: Cherry-pick of ENT-6315 - Allow dumping of paused flows ( #7008 ) ( #7363 )
...
This is a cherry-pick of https://github.com/corda/corda/pull/7008 , which also resolves ENT-6515
Co-authored-by: Dan Newton <dan.newton@r3.com >
2023-05-11 09:49:40 +01:00
2f53e8115f
Fwd-merge from OS 4.9
2023-04-27 16:45:16 +01:00
34d4a5f667
Fwd-merge from OS 4.8
2023-04-26 22:54:20 +01:00
e12ab8194f
Merge branch 'release/os/4.7' into cc/merge/os-4.7-os-4.8/25-apr-2023
...
Fwd-merge from OS 4.7.
2023-04-25 14:54:21 +01:00
91c38fa84b
Merge branch 'release/os/4.6' into cc/merge/os-4.6-os-4.7/24-apr-2023
...
Fwd-merge from OS 4.6.
2023-04-24 20:13:50 +01:00
e5a6cac9e8
Flakey test fix
2023-04-21 16:00:19 +01:00
c58c49d27a
Upgrade corda/crash, snakeyaml
2023-04-20 14:01:20 +01:00
29dfda3730
Resolved build-check issues
2023-04-18 20:34:42 +01:00
7b6fc51710
Merge branch 'release/os/4.9' into shams-4.10-fwrd-merge-ceb76c56
...
# Conflicts:
# common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/SSLHelper.kt
2023-04-12 16:23:59 +01:00
c9fd22855e
Resolve compile issues
2023-04-11 12:16:02 +01:00
724a4e5a36
Merge branch 'release/os/4.8' into shams-4.9-fwrd-merge-d140cb59
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt
# node/src/main/kotlin/net/corda/node/internal/artemis/CertificateChainCheckPolicy.kt
2023-04-11 11:54:26 +01:00
ddb979d693
ENT-8898: Revert change made to externalCrlSource checking
...
It's now moved back to createPKIXRevocationChecker(). RevocationConfig.enrichExternalCrlSource has also been removed, and moved to where it's called.
2023-04-06 14:42:38 +01:00
1e6ccfdb60
ENT-8898: Replaced JDK cert revocation with custom plugable implementation ( #7322 )
2023-04-03 10:26:01 +01:00
0213861d22
ENT-9569: Apply the 60s SSL handshake timeout to the embedded Artemis server ( #7315 )
2023-03-22 13:22:12 +00:00
044b83508e
ENT-8823: Added copyBaggageToTags configuration option to control if baggage is copied to tags.
...
Switched SimplLogTelemetryComponent to info logs.
2022-12-08 16:54:38 +00:00
563a7fb6c1
Merge branch 'release/os/4.9' into cc/merge/os-4.9/os-4.10/28-Nov-2022
...
Fwd-merge from OS-4.9.
2022-11-28 13:14:07 +00:00
3e25f7fd1a
ENT-8817 OS port of compute deadlock changes
2022-11-25 09:31:41 +00:00
31d9f0df09
Merge branch 'release/os/4.9' into cc/merge/os-4.9/os-4.10/24-Nov-2022
...
Fwd-merge from OS 4.9.
2022-11-24 18:27:54 +00:00
0131163db0
ENT-8814 - back-fit changes from Enterprise to OS ( #7272 )
2022-11-24 18:13:35 +00:00
e46b7bdd5a
ENT-6893: Added interface for clients to grab openetelemetry handle. ( #7264 )
...
* ENT-6893: Added interface for clients to grab openetelemetry handle.
* ENT-6893: Make detekt happy.
* ENT-6893: Fix warnings.
* ENT-6893: Make detekt happy.
* ENT-6893: Now shutdown opentelemetry when node stops or client is closed.
* ENT-6893: OpenTelemetryDriver is not not a singleton.
2022-11-24 13:34:08 +00:00
188027c1f5
ENT-8811 OS port of flow draining fixes ( #7269 )
2022-11-24 10:27:00 +00:00
7a133f687c
ENT-6893: First cut of telemetry integration. ( #7247 )
...
First cut of telemetry integration.
Open telemetry can be enabled in two ways, first is via an opentelemetry java agent specified on the command line. With this way you get the advantage of spans created from other libraries, like hibernate. The java agent does byte code rewriting to insert spans.
The second way is with the open telemetry driver (that links with the opentelemetry sdk). This is a fat jar provided with this project and needs to go into the node drivers directory.
2022-10-28 14:41:39 +01:00
bdcd25477d
ENT-7039: Notary signature checking requires non-interned SecureHashes. ( #7254 )
...
There was a mistake made when we first introduced notary request signature checking, in that we didn't wrap it in SerializedBytes so it always got deserialized as part of the flow message payload. So to check the signature, it has to be re-serialized. This means for cross-version compatibility we can never change the serialized format of NotarisationRequest. In this case we need make sure that every SecureHash mentioned in that data structure is a distinct instance, even if the values are repeated / identical, as that is how it was in Corda 1.
With the introduction of interning of SecureHash, this ceased to be true once again, including undoing the attempts to force it on the sending side that had been introduced in previous versions of Corda. So here we introduce a way to force it, and consolidate the forcing to distinct SecureHash instances in the NotarisationRequest itself, rather than leaving to the caller of the constructor to remember to do it, so that serialized form will always be as per Corda 1.
2022-10-28 14:03:47 +01:00
b29713d7b9
ENT-6947 Intern common types to reduce heap footprint ( #7239 )
...
ENT-6947: Implement interning for SecureHash, CordaX500Name, PublicKey, AsbtractParty and SignatureAttachmentConstraint, including automatic detection of internable types off companion objects in AMQP & Kyro deserialization. In some cases, add new factory methods to companion objects, and make main code base use them.
Performance tested in performance cluster with no negative impact visible (so default concurrency setting seems okay).
Testing suggests 5-6x memory saving for tokens in TokensSDK in memory selector. Should see approx. 1 million tokens per GB or better (1.5 million for the tokens we tested with).
2022-10-18 09:28:41 +01:00
5ca5b8d096
Do not black-list AMQP targets that suffer a handshake failure
2022-09-13 11:41:19 +01:00
54fdd12a2d
ENT-6866 support quick RPCs that are not processed via the RPC thread pool ( #7213 )
...
* ENT-6866 support quick RPCs that are not processed via the RPC thread pool
2022-07-07 12:33:51 +01:00
0a59d578ff
Merge branch 'release/os/4.9' into hjkim/os-4.9-4.10-merge-24062022
...
This merge includes a bugfix ENT-6714 which Corda logs database
password.
2022-06-24 16:08:16 +01:00
8d34be5129
ENT-6714: Fix Corda logging database password
...
This commit ports the previously implemented fix from Corda ENT. Due to
the unrelated changes and merge conflict, the fix has been manually
copied rather than cherry-picked.
2022-06-23 23:03:10 +01:00
199f635d69
Attempt to fix service priority tests when they are run on Jenkins
2022-06-15 11:56:03 +01:00
c57bbd1c39
Added integration tests for service event priorities
2022-06-14 17:15:31 +01:00
03fa529292
ENT-6791 New service lifecycle event published just before starting the state machine ( #7164 )
2022-06-10 19:56:02 +01:00
f0d530ab8b
Post review updates; renamed tests/files, neater Kotlin test code
2022-06-08 16:30:06 +01:00
