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

CORE-20867 add a flow retry topic to handle retries of transient RPC calls #1707

Closed
wants to merge 10 commits into from
Closed

CORE-20867 add a flow retry topic to handle retries of transient RPC calls #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
13888b2
CORE-20867 add a flow retry topic to handle retries of transient RPC …
LWogan Oct 22, 2024
f7d8129
CORE-20867 add max poll records constant
LWogan Oct 22, 2024
58e9c5e
CORE-20867 add transient error retry limit timeout
LWogan Oct 22, 2024
e84724e
CORE-20867 add avro object to track sync request headers
LWogan Oct 24, 2024
45eead8
CORE-20867 simplify avro record
LWogan Oct 25, 2024
e7fd64e
CORE-20867 turn avro object into string
LWogan Oct 25, 2024
1453c99
CORE-20867 remove object not needed
LWogan Oct 25, 2024
afe74d8
CORE-20867 add timestamp so it unique
LWogan Nov 7, 2024
9ec3654
CORE-20867 update config descriptions. remove topic not required
LWogan Nov 8, 2024
71b1044
CORE-20867 move config to the flow config
LWogan Nov 8, 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
3 changes: 2 additions & 1 deletion data/avro-schema/src/main/resources/avro/net/corda/data/flow/event/FlowEvent.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"net.corda.data.flow.event.StartFlow",
"net.corda.data.flow.output.FlowStatus",
"net.corda.data.flow.event.SessionEvent",
"net.corda.data.flow.event.external.ExternalEventResponse"
"net.corda.data.flow.event.external.ExternalEventResponse",
"net.corda.data.flow.event.external.ExternalEventRetryRequest"
]
}
]
Expand Down
21 changes: 21 additions & 0 deletions ...src/main/resources/avro/net/corda/data/flow/event/external/ExternalEventRetryRequest.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"type": "record",
"name": "ExternalEventRetryRequest",
"namespace": "net.corda.data.flow.event.external",
"doc": "This event captures the details of the external event request to allow it to be polled from the bus and retried.",
"fields": [
{
"name": "requestId",
"type": "string",
"doc": "The requestId of the external event request to retry."
},
{
"name": "timestamp",
"type": {
"type": "long",
"logicalType": "timestamp-millis"
},
"doc": "Time ([Instant]) in milliseconds when the request was created. Ensures each request is unique for replay logic."
}
]
}
1 change: 1 addition & 0 deletions data/config-schema/src/main/java/net/corda/schema/configuration/FlowConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ private FlowConfig() {

public static final String EXTERNAL_EVENT_MESSAGE_RESEND_WINDOW = "event.messageResendWindow";
public static final String EXTERNAL_EVENT_MAX_RETRIES = "event.maxRetries";
public static final String EXTERNAL_EVENT_TRANSIENT_ERROR_TIMEOUT = "event.transientErrorRetryTimeout";
public static final String SESSION_TIMEOUT_WINDOW = "session.timeout";
public static final String SESSION_P2P_TTL = "session.p2pTTL";
public static final String SESSION_FLOW_CLEANUP_TIME = "session.cleanupTime";
Expand Down
1 change: 1 addition & 0 deletions data/config-schema/src/main/java/net/corda/schema/configuration/MessagingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ private Bus() {
public static final String KAFKA_BOOTSTRAP_SERVERS = KAFKA_PROPERTIES_COMMON + ".bootstrap.servers";
public static final String KAFKA_PROPERTIES_CONSUMER = KAFKA_PROPERTIES + ".consumer";
public static final String KAFKA_CONSUMER_MAX_POLL_INTERVAL = KAFKA_PROPERTIES_CONSUMER + ".max.poll.interval.ms";
public static final String KAFKA_CONSUMER_MAX_POLL_RECORDS = KAFKA_PROPERTIES_CONSUMER + ".max.poll.records";
public static final String KAFKA_PROPERTIES_PRODUCER = KAFKA_PROPERTIES + ".producer";
public static final String KAFKA_PRODUCER_CLIENT_ID = KAFKA_PROPERTIES_PRODUCER + ".client.id";

Expand Down
9 changes: 8 additions & 1 deletion .../config-schema/src/main/resources/net/corda/schema/configuration/flow/1.0/corda.flow.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,18 @@
"default": 60000
},
"maxRetries": {
"description": "The maximum number of times Corda retries a request before returning an exception.",
"description": "The maximum number of times Corda retries a request before returning an exception for error cases other than transient errors.",
"type": "integer",
"minimum": 0,
"maximum": 2147483647,
"default": 5
},
"transientErrorRetryTimeout": {
"description": "The length of time in milliseconds the flow engine will allow an inter-worker RPC call to return transient errors before marking the flow as failed.",
"type": "integer",
"minimum": 1000,
"maximum": 2147483647,
"default": 1200000
}
},
"additionalProperties": false
Expand Down
1 change: 0 additions & 1 deletion data/topic-schema/src/main/resources/net/corda/schema/Flow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,3 @@ topics:
producers:
- flow
config:

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.2.1
# 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 = 53
cordaApiRevision = 54

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