Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CORE-20347: Add link ack in #1614

Closed
wants to merge 3 commits into from
Closed

CORE-20347: Add link ack in #1614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bea110
CORE-20347: Add link ack in
yift-r3 Apr 18, 2024
2ab91f4
Merge branch 'release/os/5.3' into yift/core-20347/integration
yift-r3 Apr 22, 2024
0803421
Remove maxCacheSizeMegabytes
yift-r3 Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ...n/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,6 @@
"type": "object",
"default": {},
"properties": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can't remove config properties, see https://r3-cev.atlassian.net/wiki/spaces/CB/pages/4564091182/Making+a+Config+Change#Not-Permitted-Changes

The reason being 5.3 Corda will read 5.2 config on startup after an upgrade, it will see this property from the existing config and flag it's an invalid property not in its schema and fail.

"maxCacheSizeMegabytes": {
"description": "The maximum allowed size of the data message cache in megabytes.",
"type": "integer",
"default": 100,
"minimum": 1
},
"maxCacheOffsetAge": {
"description": "The oldest offset of a cached data message, relative to the last sent message offset (in number of records).",
"type": "integer",
Expand Down
1 change: 1 addition & 0 deletions data/topic-schema/src/main/java/net/corda/schema/Schemas.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ private P2P() {
public static final String P2P_MGM_ALLOWED_CLIENT_CERTIFICATE_SUBJECTS = "p2p.mgm.allowed.client.certificate.subjects";
public static final String LINK_OUT_TOPIC = "link.out";
public static final String LINK_IN_TOPIC = "link.in";
public static final String LINK_ACK_IN_TOPIC = "link.ack.in";
public static final String GATEWAY_TLS_TRUSTSTORES = "gateway.tls.truststores";
public static final String GATEWAY_TLS_CERTIFICATES = "gateway.tls.certs";
public static final String GATEWAY_REVOCATION_CHECK_REQUEST_TOPIC = "gateway.revocation.request";
Expand Down
7 changes: 7 additions & 0 deletions data/topic-schema/src/main/resources/net/corda/schema/P2P.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,13 @@ topics:
producers:
- gateway
config:
LinkAckInTopic:
name: link.ack.in
consumers:
- link-manager
producers:
- link-manager
config:
LinkOutTopic:
name: link.out
consumers:
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cordaProductVersion = 5.3.0
# NOTE: update this each time this module contains a breaking change
## NOTE: currently this is a top level revision, so all API versions will line up, but this could be moved to
## a per module property in which case module versions can change independently.
cordaApiRevision = 12
cordaApiRevision = 212

# Main
kotlin.stdlib.default.dependency = false
Expand Down