From 985cd214d5da4e24f6e88d22e5e8463cacb3e03c Mon Sep 17 00:00:00 2001 From: nikinagy Date: Thu, 19 Oct 2023 10:48:46 +0100 Subject: [PATCH 01/13] add new config values --- .../p2p.linkManager/1.0/corda.p2p.linkManager.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json b/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json index 5177b39dba..647dabd1ea 100644 --- a/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json +++ b/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json @@ -89,10 +89,16 @@ "default": 10000, "minimum": 500 }, - "sessionsPerPeer": { - "description": "The number of actively maintained sessions between two peers.", + "sessionsPerPeerForMgm": { + "description": "The number of actively maintained sessions between two peers if one of them is an MGM.", "type": "integer", - "default": 4, + "default": 1, + "minimum": 1 + }, + "sessionsPerPeerForMembers": { + "description": "The number of actively maintained sessions between two peers if both peers are members.", + "type": "integer", + "default": 2, "minimum": 1 }, "revocationCheck": { From 21c94e201a5063d7db8ccbb8b0073c2d38fe67cd Mon Sep 17 00:00:00 2001 From: nikinagy Date: Thu, 19 Oct 2023 10:49:47 +0100 Subject: [PATCH 02/13] bump api version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ed6f197a28..f865f32176 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ cordaProductVersion = 5.1.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 = 37 +cordaApiRevision = 38 # Main kotlinVersion = 1.8.21 From 5d1fe45ce9e9c4d120df4a1c7505018a982286ff Mon Sep 17 00:00:00 2001 From: nikinagy Date: Thu, 19 Oct 2023 15:23:00 +0100 Subject: [PATCH 03/13] remove owners --- .github/CODEOWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 734204008d..e69de29bb2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +0,0 @@ -* @driessamyn @jasonbyrner3 @dimosr @ronanbrowne @rick-r3 @simon-johnson-r3 @blsemo @Omar-awad @aditisdesai @vinir3 @vkolomeyko @thiagoviana @Sakpal From b7a9b6190a611ae2ca65cc2b2827d7db2e6001d1 Mon Sep 17 00:00:00 2001 From: nikinagy Date: Wed, 1 Nov 2023 15:49:35 +0000 Subject: [PATCH 04/13] remove owners and rename api revision --- .github/CODEOWNERS | 1 - gradle.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 734204008d..e69de29bb2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +0,0 @@ -* @driessamyn @jasonbyrner3 @dimosr @ronanbrowne @rick-r3 @simon-johnson-r3 @blsemo @Omar-awad @aditisdesai @vinir3 @vkolomeyko @thiagoviana @Sakpal diff --git a/gradle.properties b/gradle.properties index c44844ecd3..67dd932617 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ cordaProductVersion = 5.1.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 = 37 +cordaApiRevision = 37-NETWORK # Main kotlinVersion = 1.8.21 From 14086bd8460d30d121c39b832a543178b809c453 Mon Sep 17 00:00:00 2001 From: nikinagy Date: Thu, 2 Nov 2023 15:43:11 +0000 Subject: [PATCH 05/13] rename api revision --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b7d3d05dcc..564f8a0d05 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ cordaProductVersion = 5.1.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 = 38 +cordaApiRevision = 38-NETWORK # Main kotlinVersion = 1.8.21 From 899f476beb9c45065d325052c36c1a79e87119e1 Mon Sep 17 00:00:00 2001 From: Charlie Crean Date: Fri, 3 Nov 2023 11:16:02 +0000 Subject: [PATCH 06/13] CORE-0 Set up network team 5.2 branch --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c44844ecd3..612ed7d377 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ cordaProductVersion = 5.1.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 = 37 +cordaApiRevision = 37-NETWORK-5-2 # Main kotlinVersion = 1.8.21 From 97e0059b4dbd48c58479b0bff30d0eb023e38ba4 Mon Sep 17 00:00:00 2001 From: nikinagy Date: Tue, 7 Nov 2023 13:58:25 +0000 Subject: [PATCH 07/13] address comments --- .../1.0/corda.p2p.linkManager.json | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json b/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json index 647dabd1ea..6c04b2ba83 100644 --- a/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json +++ b/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json @@ -89,17 +89,30 @@ "default": 10000, "minimum": 500 }, - "sessionsPerPeerForMgm": { - "description": "The number of actively maintained sessions between two peers if one of them is an MGM.", - "type": "integer", - "default": 1, + "sessionsPerPeer": { + "description": "The number of actively maintained sessions between two peers.", + "type": ["integer", "null"], + "default": null, "minimum": 1 }, - "sessionsPerPeerForMembers": { - "description": "The number of actively maintained sessions between two peers if both peers are members.", - "type": "integer", - "default": 2, - "minimum": 1 + "numOfSessionsPerPeer": { + "description": "The number of actively maintained sessions between two peers.", + "type": "object", + "default": {}, + "properties": { + "forMGM": { + "description": "The number of actively maintained sessions between two peers if one of them is an MGM.", + "type": "integer", + "default": 1, + "minimum": 1 + }, + "forMembers": { + "description": "The number of actively maintained sessions between two peers if both peers are members.", + "type": "integer", + "default": 2, + "minimum": 1 + } + } }, "revocationCheck": { "type": "object", From 0ed8597fd506ab3ffd281c9643b48c878d0b9365 Mon Sep 17 00:00:00 2001 From: nikinagy Date: Tue, 7 Nov 2023 14:00:50 +0000 Subject: [PATCH 08/13] revert change --- .../src/main/java/net/corda/rbac/schema/RbacKeys.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/rbac-schema/src/main/java/net/corda/rbac/schema/RbacKeys.java b/data/rbac-schema/src/main/java/net/corda/rbac/schema/RbacKeys.java index 30bb1dadac..1215b61a61 100644 --- a/data/rbac-schema/src/main/java/net/corda/rbac/schema/RbacKeys.java +++ b/data/rbac-schema/src/main/java/net/corda/rbac/schema/RbacKeys.java @@ -50,7 +50,7 @@ private RbacKeys() { /** * Flow start client request ID. */ - public static final String CLIENT_REQ_REGEX = "[-._A-Za-z0-9]{1,242}"; + public static final String CLIENT_REQ_REGEX = "[-._A-Za-z0-9]{1,250}"; /** * FQN for a flow to be started. From b2d63a2a14e7b68baf400fc5c5087fd92c8af95c Mon Sep 17 00:00:00 2001 From: nikinagy Date: Tue, 7 Nov 2023 14:01:55 +0000 Subject: [PATCH 09/13] revert change --- .../src/main/java/net/corda/rbac/schema/RbacKeys.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/rbac-schema/src/main/java/net/corda/rbac/schema/RbacKeys.java b/data/rbac-schema/src/main/java/net/corda/rbac/schema/RbacKeys.java index 1215b61a61..30bb1dadac 100644 --- a/data/rbac-schema/src/main/java/net/corda/rbac/schema/RbacKeys.java +++ b/data/rbac-schema/src/main/java/net/corda/rbac/schema/RbacKeys.java @@ -50,7 +50,7 @@ private RbacKeys() { /** * Flow start client request ID. */ - public static final String CLIENT_REQ_REGEX = "[-._A-Za-z0-9]{1,250}"; + public static final String CLIENT_REQ_REGEX = "[-._A-Za-z0-9]{1,242}"; /** * FQN for a flow to be started. From b356d32674251cc462523504ad2b366d52d3d0a5 Mon Sep 17 00:00:00 2001 From: Charlie Crean <69511999+charlieR3@users.noreply.github.com> Date: Tue, 7 Nov 2023 16:48:54 +0000 Subject: [PATCH 10/13] CORE-18229 Set code owners on feature branch (#1329) Set the code owners on the platform network branch to just the platform network team. Not to be merged to the 5.2 branch once it is created. --- .github/CODEOWNERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 734204008d..824f55c919 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1,2 @@ -* @driessamyn @jasonbyrner3 @dimosr @ronanbrowne @rick-r3 @simon-johnson-r3 @blsemo @Omar-awad @aditisdesai @vinir3 @vkolomeyko @thiagoviana @Sakpal +* @corda/corda-platform-network-team + From f5a066e84385024329762938a3874a977efc474a Mon Sep 17 00:00:00 2001 From: nikinagy Date: Wed, 8 Nov 2023 13:27:43 +0000 Subject: [PATCH 11/13] fix naming --- .../p2p.linkManager/1.0/corda.p2p.linkManager.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json b/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json index 6c04b2ba83..b14cb7a46d 100644 --- a/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json +++ b/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json @@ -100,7 +100,7 @@ "type": "object", "default": {}, "properties": { - "forMGM": { + "forMgm": { "description": "The number of actively maintained sessions between two peers if one of them is an MGM.", "type": "integer", "default": 1, From 980cb7f1e2b40256508cee92a25f223b288ffb15 Mon Sep 17 00:00:00 2001 From: nikinagy Date: Wed, 8 Nov 2023 15:22:11 +0000 Subject: [PATCH 12/13] address comments --- .../p2p.linkManager/1.0/corda.p2p.linkManager.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json b/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json index b14cb7a46d..25876b8c05 100644 --- a/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json +++ b/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json @@ -101,13 +101,13 @@ "default": {}, "properties": { "forMgm": { - "description": "The number of actively maintained sessions between two peers if one of them is an MGM.", + "description": "The number of actively maintained sessions between two peers if one of them is an MGM. Communication between an MGM and a member is not considered critical and so the default value of 1 is recommended to improve performance.", "type": "integer", "default": 1, "minimum": 1 }, "forMembers": { - "description": "The number of actively maintained sessions between two peers if both peers are members.", + "description": "The number of actively maintained sessions between two peers if both peers are members. The default value of 2 is recommended because the chance of both sessions failing on the same link manager is relatively low. If high-availability is critical, R3 recommends deploying multiple link manager instances instead.", "type": "integer", "default": 2, "minimum": 1 From 182a7d47b2bd4fb8a42106200caafbefa17dd608 Mon Sep 17 00:00:00 2001 From: nikinagy Date: Tue, 14 Nov 2023 16:26:01 +0000 Subject: [PATCH 13/13] address comments --- .../p2p.linkManager/1.0/corda.p2p.linkManager.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json b/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json index 25876b8c05..eafdd208e2 100644 --- a/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json +++ b/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json @@ -90,7 +90,7 @@ "minimum": 500 }, "sessionsPerPeer": { - "description": "The number of actively maintained sessions between two peers.", + "description": "Deprecated field, numOfSessionsPerPeer should be used instead. The number of actively maintained sessions between two peers.", "type": ["integer", "null"], "default": null, "minimum": 1