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-17360: Add topics for mapper scheduled cleanup and update cleanup Avro records #1265

Merged
merged 4 commits into from
Sep 28, 2023
Merged

CORE-17360: Add topics for mapper scheduled cleanup and update cleanup Avro records #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12ef556
CORE-17360: Add topics for mapper scheduled cleanup and update cleanu…
JamesHR3 Sep 26, 2023
cf3bdd2
CORE-17360: Add ACLs to new topics
JamesHR3 Sep 27, 2023
ec43462
Merge branch 'release/os/5.1' into jamesh/core-17360-mapper-cleanup-t…
JamesHR3 Sep 27, 2023
d732b56
CORE-17360: Update version number
JamesHR3 Sep 27, 2023
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
8 changes: 8 additions & 0 deletions .../avro-schema/src/main/resources/avro/net/corda/data/flow/event/mapper/ExecuteCleanup.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,13 @@
"docs": "When this event is processed the flow mapper state should be set to null",
"namespace": "net.corda.data.flow.event.mapper",
"fields": [
{
"name": "ids",
"docs": "A list of IDs of mapper states that should be deleted",
"type": {
"type": "array",
"items": "string"
}
}
]
}
2 changes: 2 additions & 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 @@ -103,6 +103,7 @@ private Flow() {
public static final String FLOW_MAPPER_EVENT_TOPIC = "flow.mapper.event";
public static final String FLOW_MAPPER_EVENT_STATE_TOPIC = getStateAndEventStateTopic(FLOW_MAPPER_EVENT_TOPIC);
public static final String FLOW_MAPPER_EVENT_DLQ_TOPIC = getDLQTopic(FLOW_MAPPER_EVENT_TOPIC);
public static final String FLOW_MAPPER_CLEANUP_TOPIC = "flow.mapper.cleanup";
}

/**
Expand Down Expand Up @@ -267,5 +268,6 @@ public static final class ScheduledTask {
private ScheduledTask() {}

public static final String SCHEDULED_TASK_DB_PROCESSOR = "scheduled.task.db.processor";
public static final String SCHEDULED_TASK_MAPPER_PROCESSOR = "scheduled.task.mapper.processor";
}
}
7 changes: 7 additions & 0 deletions 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 @@ -80,3 +80,10 @@ topics:
min.compaction.lag.ms: 60000
max.compaction.lag.ms: 604800000
min.cleanable.dirty.ratio: 0.5
FlowMapperCleanupTopic:
name: flow.mapper.cleanup
consumers:
- flowMapper
producers:
- flowMapper
config:
6 changes: 6 additions & 0 deletions data/topic-schema/src/main/resources/net/corda/schema/ScheduledTask.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,9 @@ topics:
- db
producers:
- db
ScheduledTaskFlowMapperProcessorTopic:
name: scheduled.task.mapper.processor
consumers:
- flowMapper
producers:
- db
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 @@ -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 = 24
cordaApiRevision = 25

# Main
kotlinVersion = 1.8.21
Expand Down