Skip to content

Remove inheritVariables for processBatches call activities #1893

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

Merged
stiv03 merged 2 commits into from
Aug 14, 2026
Merged

Remove inheritVariables for processBatches call activities #1893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50d01d4
Remove inheritVariables for processBatches call activities
stiv03 Aug 3, 2026
4bb5beb
Fix comments
stiv03 Aug 13, 2026
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
30 changes: 29 additions & 1 deletion ...rocess/src/main/resources/org/cloudfoundry/multiapps/controller/process/rollback-mta.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,35 @@
</multiInstanceLoopCharacteristics>
</callActivity>
<exclusiveGateway id="shouldDeleteDiscontinuedServicesGateway" name="Should Delete Discontinued Services" default="doNotDeleteDiscontinuedServicesFlow"></exclusiveGateway>
<callActivity id="processBatchesSequentially" name="Process Resource Batches Sequentially" flowable:async="true" calledElement="processBatches" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="processBatchesSequentially" name="Process Resource Batches Sequentially" flowable:async="true" calledElement="processBatches" flowable:calledElementType="key" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="user" target="user"></flowable:in>
<flowable:in source="userGuid" target="userGuid"></flowable:in>
<flowable:in source="correlationId" target="correlationId"></flowable:in>
<flowable:in source="serviceKeysToCreate" target="serviceKeysToCreate"></flowable:in>
<flowable:in source="deleteServices" target="deleteServices"></flowable:in>
<flowable:in source="initiator" target="initiator"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="space" target="space"></flowable:in>
<flowable:in source="deleteServiceKeys" target="deleteServiceKeys"></flowable:in>
<flowable:in source="mtaArchiveElements" target="mtaArchiveElements"></flowable:in>
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
<flowable:in source="orgId" target="orgId"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="namespace" target="namespace"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="dynamicResolvableParameters" target="dynamicResolvableParameters"></flowable:in>
<flowable:in source="ctsCurrentFileInfo" target="ctsCurrentFileInfo"></flowable:in>
<flowable:in source="archiveEntriesPositions" target="archiveEntriesPositions"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="stepPhase" target="stepPhase"></flowable:in>
<flowable:in source="batchToProcess" target="batchToProcess"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="true" flowable:collection="batchesToProcess" flowable:elementVariable="batchToProcess">
<extensionElements></extensionElements>
</multiInstanceLoopCharacteristics>
Expand Down
30 changes: 29 additions & 1 deletion ...ocess/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-bg-deploy.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,35 @@
<sequenceFlow id="flow155" sourceRef="computeNextAppsToRestartInParallel" targetRef="restartAppsParallel"></sequenceFlow>
<sequenceFlow id="flow156" sourceRef="restartAppsParallel" targetRef="hasParallelRestartCompletedGateway"></sequenceFlow>
<exclusiveGateway id="shouldDeleteDiscontinuedServicesGateway" name="Should Delete Discontinued Services" default="doNotDeleteDiscontinuedServicesFlow"></exclusiveGateway>
<callActivity id="processBatchesSequentially" name="Process Resource Batches Sequentially" flowable:async="true" calledElement="processBatches" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="processBatchesSequentially" name="Process Resource Batches Sequentially" flowable:async="true" calledElement="processBatches" flowable:calledElementType="key" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="user" target="user"></flowable:in>
<flowable:in source="userGuid" target="userGuid"></flowable:in>
<flowable:in source="correlationId" target="correlationId"></flowable:in>
<flowable:in source="serviceKeysToCreate" target="serviceKeysToCreate"></flowable:in>
<flowable:in source="deleteServices" target="deleteServices"></flowable:in>
<flowable:in source="initiator" target="initiator"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="space" target="space"></flowable:in>
<flowable:in source="deleteServiceKeys" target="deleteServiceKeys"></flowable:in>
<flowable:in source="mtaArchiveElements" target="mtaArchiveElements"></flowable:in>
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
<flowable:in source="orgId" target="orgId"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="namespace" target="namespace"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="dynamicResolvableParameters" target="dynamicResolvableParameters"></flowable:in>
<flowable:in source="ctsCurrentFileInfo" target="ctsCurrentFileInfo"></flowable:in>
<flowable:in source="archiveEntriesPositions" target="archiveEntriesPositions"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="stepPhase" target="stepPhase"></flowable:in>
<flowable:in source="batchToProcess" target="batchToProcess"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="true" flowable:collection="batchesToProcess" flowable:elementVariable="batchToProcess">
<extensionElements></extensionElements>
</multiInstanceLoopCharacteristics>
Expand Down
30 changes: 29 additions & 1 deletion ...-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-deploy.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,35 @@
<flowable:executionListener event="take" delegateExpression="${doNotDeleteServicesListener}"></flowable:executionListener>
</extensionElements>
</sequenceFlow>
<callActivity id="processBatchesSequentially" name="Process Resource Batches Sequentially" flowable:async="true" calledElement="processBatches" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="processBatchesSequentially" name="Process Resource Batches Sequentially" flowable:async="true" calledElement="processBatches" flowable:calledElementType="key" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">

@IvanBorislavovDimitrov IvanBorislavovDimitrov Aug 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Variable externalLoggingServiceConfigurations seems to be missing for the new cloud logging feature. Maybe needed in all diagrams

@stiv03 stiv03 Aug 13, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I added it

<extensionElements>
<flowable:in source="user" target="user"></flowable:in>
<flowable:in source="userGuid" target="userGuid"></flowable:in>
<flowable:in source="correlationId" target="correlationId"></flowable:in>
<flowable:in source="serviceKeysToCreate" target="serviceKeysToCreate"></flowable:in>
<flowable:in source="deleteServices" target="deleteServices"></flowable:in>
<flowable:in source="initiator" target="initiator"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="space" target="space"></flowable:in>
<flowable:in source="deleteServiceKeys" target="deleteServiceKeys"></flowable:in>
<flowable:in source="mtaArchiveElements" target="mtaArchiveElements"></flowable:in>
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
<flowable:in source="orgId" target="orgId"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="namespace" target="namespace"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="dynamicResolvableParameters" target="dynamicResolvableParameters"></flowable:in>
<flowable:in source="ctsCurrentFileInfo" target="ctsCurrentFileInfo"></flowable:in>
<flowable:in source="archiveEntriesPositions" target="archiveEntriesPositions"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="stepPhase" target="stepPhase"></flowable:in>
<flowable:in source="batchToProcess" target="batchToProcess"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="true" flowable:collection="batchesToProcess" flowable:elementVariable="batchToProcess">
<extensionElements></extensionElements>
</multiInstanceLoopCharacteristics>
Expand Down
Loading