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

Migrate message experiment #278

Merged
merged 4 commits into from
Dec 8, 2022
Merged

Migrate message experiment #278

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
bfa809d
refactor: unify models
ChrisKujawa Dec 7, 2022
d210f7b
feat: allow to reference bundled processes
ChrisKujawa Dec 8, 2022
9ec65d2
test: rm json logging, for easier reading
ChrisKujawa Dec 8, 2022
7380c39
feat: migrate message correlation
ChrisKujawa Dec 8, 2022
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
2 changes: 1 addition & 1 deletion go-chaos/cmd/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func init() {

deployCmd.AddCommand(deployProcessModelCmd)
deployProcessModelCmd.Flags().StringVar(&processModelPath, "processModelPath", "",
"Specify the path to a BPMN process model, which should be deployed. Defaults to a benchmark process model with one task (included in zbchaos).")
"Specify the path to a BPMN process model, which should be deployed. Defaults to a benchmark process model with one task (included in zbchaos). If the path starts with 'bpmn/' zbchaos will look for a referenced model bundled within the cli, like: 'bpmn/one_task.bpmn'.")

deployCmd.AddCommand(deployMultiVersionProcessModelCmd)
deployMultiVersionProcessModelCmd.Flags().IntVar(&versionCount, "versionCount", 10,
Expand Down
1 change: 0 additions & 1 deletion go-chaos/integration/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ func Test_ShouldBeAbleToRunExperiments(t *testing.T) {
// given
internal.Verbosity = true
cmd.Verbose = true
cmd.JsonLogging = true
ctx := context.Background()
container := CreateEZEContainer(t, ctx)
defer container.StopLogProducer()
Expand Down
22 changes: 11 additions & 11 deletions go-chaos/internal/bpmn/msg-catch.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_1toz9lw" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.2.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.0.0">
<bpmn:process id="Process_0vxxyp6" isExecutable="true">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_1toz9lw" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.5.1" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.0.0">
<bpmn:process id="oneReceiveMsgEvent" isExecutable="true">
<bpmn:startEvent id="StartEvent_1" name="Start">
<bpmn:extensionElements />
<bpmn:outgoing>Flow_1gq79wv</bpmn:outgoing>
Expand All @@ -22,15 +22,7 @@
</bpmn:extensionElements>
</bpmn:message>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_0vxxyp6">
<bpmndi:BPMNEdge id="Flow_12i7fo9_di" bpmnElement="Flow_12i7fo9">
<di:waypoint x="308" y="97" />
<di:waypoint x="372" y="97" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1gq79wv_di" bpmnElement="Flow_1gq79wv">
<di:waypoint x="215" y="97" />
<di:waypoint x="272" y="97" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="oneReceiveMsgEvent">
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
<dc:Bounds x="179" y="79" width="36" height="36" />
<bpmndi:BPMNLabel>
Expand All @@ -49,6 +41,14 @@
<dc:Bounds x="380" y="122" width="20" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_1gq79wv_di" bpmnElement="Flow_1gq79wv">
<di:waypoint x="215" y="97" />
<di:waypoint x="272" y="97" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_12i7fo9_di" bpmnElement="Flow_12i7fo9">
<di:waypoint x="308" y="97" />
<di:waypoint x="372" y="97" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
44 changes: 0 additions & 44 deletions go-chaos/internal/bpmn/oneReceiveMsgEvent.bpmn
View file
Open in desktop

This file was deleted.

51 changes: 38 additions & 13 deletions ...aos/internal/chaos-experiments/camunda-cloud/production-s/msg-correlation/experiment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,66 @@
"tolerance": 0,
"provider": {
"type": "process",
"path": "verify-readiness.sh",
"path": "zbchaos",
"arguments": ["verify", "readiness"],
"timeout": 900
}
}
]
},
"method": [
{
"name": "Deploy process model with catch event",
"type": "action",
"tolerance": 0,
"provider": {
"type": "process",
"path": "zbchaos",
"arguments": ["deploy", "process", "--processModelPath", "bpmn/msg-catch.bpmn"]
}
},
{
"type": "action",
"name": "Publish message to partition one",
"tolerance": 0,
"provider": {
"type": "process",
"path": "publish-message.sh",
"timeout": 900
"path": "zbchaos",
"arguments": ["publish", "--partitionId", "1"]
}
},
{
"type": "action",
"name": "Terminate leader of partition 1 non-gracefully",
"provider": {
"type": "process",
"path": "terminate-partition.sh",
"arguments": [ "Leader", "1" ]
"path": "zbchaos",
"arguments": ["terminate", "broker", "--role", "LEADER", "--partitionId", "1"]
}
},
{
"name": "Should be able to create a process and await the message correlation",
"type": "probe",
"tolerance": 0,
"provider": {
"type": "process",
"path": "await-message-correlation.sh",
"timeout": 900
}
"name": "All pods should be ready",
"type": "probe",
"tolerance": 0,
"provider": {
"type": "process",
"path": "zbchaos",
"arguments": ["verify", "readiness"],
"timeout": 900
}
},
{
"name": "Should be able to create a process instance and await the message correlation",
"type": "probe",
"tolerance": 0,
"provider": {
"type": "process",
"path": "zbchaos",
"arguments": ["verify", "instance-creation",
"--awaitResult",
"--bpmnProcessId", "oneReceiveMsgEvent",
"--variables", "{\"key\": \"0\"}"]
}
}
],
"rollbacks": []
Expand Down
7 changes: 6 additions & 1 deletion go-chaos/internal/zeebe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"errors"
"fmt"
"os"
"strings"
"time"

"github.com/camunda/zeebe/clients/go/v8/pkg/pb"
Expand Down Expand Up @@ -260,7 +261,11 @@ func readBPMNFileOrDefault(fileName string) ([]byte, string, error) {

if len(fileName) == 0 {
fileName = "bpmn/one_task.bpmn"

bpmnBytes, err = bpmnContent.ReadFile(fileName)
if err != nil {
return nil, "", err
}
} else if strings.Contains(fileName, "bpmn/") {
bpmnBytes, err = bpmnContent.ReadFile(fileName)
if err != nil {
return nil, "", err
Expand Down