Bg stop reorder #1761

vkalapov · 2026-01-09T12:20:21Z

No description provided.

Yavor16

Can you add also unit test for PrepareToStopDependentModulesStep

...ss/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/IncrementIndexStep.java

...va/org/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModuleStep.java

Yavor16 · 2026-01-16T08:15:21Z

...va/org/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModuleStep.java

+        Module applicationModule = findModuleInDeploymentDescriptor(context, getCurrentModuleToStop(context).getName());
+        context.setVariable(Variables.MODULE_TO_DEPLOY, applicationModule);
+        CloudApplicationExtended modifiedApp = getApplicationCloudModelBuilder(context).build(applicationModule, moduleToDeployHelper);
+        Map<String, String> calculatedAppEnv = applicationEnvironmentCalculator.calculateNewApplicationEnv(context, modifiedApp);
+        modifiedApp = ImmutableCloudApplicationExtended.builder()
+                                                       .from(modifiedApp)
+                                                       .staging(modifiedApp.getStaging())
+                                                       .routes(getApplicationRoutes(context, modifiedApp))
+                                                       .env(calculatedAppEnv)
+                                                       .build();
+        context.setVariable(Variables.APP_TO_PROCESS, modifiedApp);
+        return StepPhase.DONE;


Why are you creating here new APP_TO_PROCESS here and what is the difference from the old one?

APP_TO_PROCESS is set to the dependent app inside the subprocess. This is done due to the fact that ExecuteTaskStep relies on that variable to be set. Otherwise the logic would fail whenever a there's a need for hook executions.

...main/java/org/cloudfoundry/multiapps/controller/process/steps/SyncFlowableStepWithHooks.java

...ain/java/org/cloudfoundry/multiapps/controller/process/util/DependentModuleStopResolver.java

Yavor16 · 2026-01-16T09:07:46Z

...rg/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModuleStepTest.java

+        completeDeploymentDescriptor.setModules(List.of(module));
+        context.setVariable(Variables.DEPENDENT_MODULES_TO_STOP, List.of(module));
+        context.setVariable(Variables.APPS_TO_STOP_INDEX, 0);
+        context.setVariable(Variables.MTA_MAJOR_SCHEMA_VERSION, 3);


You can add unit test for schema version 2. So you can test the validation of the version

The reason as to why the schema version is set in this test is that when getHandlerFactory() is called it throws an exception if no version is set. Given that the schema version is already validated earlier in DependentModuleStopResolver, adding an additional check here would be redundant.

...rg/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModuleStepTest.java

...st/java/org/cloudfoundry/multiapps/controller/process/steps/StopDependentModuleStepTest.java

Yavor16 · 2026-01-16T09:23:31Z

...ler-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/deploy-app.bpmn

-    <sequenceFlow id="sid-0F200B9A-6462-48CD-BA2D-6E6F1CE15D96" sourceRef="deleteIdleRoutesTask" targetRef="shouldManageServiceBroker"></sequenceFlow>
-    <sequenceFlow id="skipDeleteIdleRoutesFlow" sourceRef="shouldDeleteIdleRoutes" targetRef="shouldManageServiceBroker"></sequenceFlow>


Why did you change the location of sequence flows?

Its changed due to the new added steps for stopping dependent modules. These specific flows should be unchanged, they've been re-ordered from the bpmn modeler.

...main/java/org/cloudfoundry/multiapps/controller/process/steps/SyncFlowableStepWithHooks.java

LMCROSSITXSADEPLOY-3367

sonarqubecloud · 2026-01-19T12:33:01Z

Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
93.4% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

s-yonkov-yonkov · 2026-01-20T13:16:00Z

...controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java

    public static final String ERROR_WHILE_UPDATING_SERVICE_KEYS_METADATA = "Error while updating service keys metadata";
    public static final String ERROR_WHILE_POLLING_SERVICE_KEY_OPERATION_0 = "Error while polling service key operation \"{0}\"";
+    public static final String ERROR_WHILE_STOPPING_DEPENDENT_MODULES = "Failed to stop dependent module with name \"{0}\"";
+    public static final String ERROR_WHEN_CONFIGURING_STOPPING_OF_DEPENDENT_MODULES = "Failed when configuring the stopping of dependent modules \"{0}\"";


All other error messages are combination of ERROR + WHILE, only this is with WHEN, do you think that it can be renamed for consistency?

s-yonkov-yonkov · 2026-01-20T13:18:00Z

...controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java

    public static final String ERROR_WHILE_DETERMINING_SERVICE_KEYS_TO_RECREATE = "Error while determining service keys to recreate";
    public static final String ERROR_WHILE_UPDATING_SERVICE_KEYS_METADATA = "Error while updating service keys metadata";
    public static final String ERROR_WHILE_POLLING_SERVICE_KEY_OPERATION_0 = "Error while polling service key operation \"{0}\"";
+    public static final String ERROR_WHILE_STOPPING_DEPENDENT_MODULES = "Failed to stop dependent module with name \"{0}\"";


The constant name is plural, but the text is not, do you think that it should be aligned?
_DEPENDENT_MODULES -> _DEPENDENT_MODULE?

s-yonkov-yonkov · 2026-01-20T13:39:03Z

...controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java

    public static final String SERVICE_INSTANCE_0_PARAMETERS_UPDATE_FAILED_IGNORING_FAILURE = "Service instance: \"{0}\" parameters update failed, ignoring failure...";
    public static final String SERVICE_INSTANCE_0_TAGS_UPDATE_FAILED_IGNORING_FAILURE = "Service instance: \"{0}\" tags update failed, ignoring failure...";
    public static final String ONLY_FIRST_SERVICE_WILL_BE_CREATED = "Only the first service will be created because the provided 'service-name' fields are duplicated! All other services with the same 'service-name' will be ignored! Duplicated names: {0}";
+    public static final String SKIPPING_DEPENDENCY_ORDER_STOP = "Skipping stopping modules in dependency-aware order. This feature is reserved only for blue green deployment strategy.";


Since it is used for blue-green deployment you may add it to the constant name, you may also consider "available for" instead of "reserved only".

s-yonkov-yonkov · 2026-01-20T14:56:38Z

...ain/java/org/cloudfoundry/multiapps/controller/process/util/DependentModuleStopResolver.java

+    }
+
+    private boolean supportsDeployedAfter(Module module, StepLogger logger) {
+        if (module.getMajorSchemaVersion() >= 3) {


You may use DEPLOYED_AFTER_MIN_SCHEMA_VERSION instead of "magic" numbers

vkalapov force-pushed the bg-stop-reorder branch 7 times, most recently from dd016cb to 7150540 Compare January 14, 2026 09:34

Yavor16 requested changes Jan 16, 2026

View reviewed changes

s-yonkov-yonkov reviewed Jan 16, 2026

View reviewed changes

...main/java/org/cloudfoundry/multiapps/controller/process/steps/SyncFlowableStepWithHooks.java Show resolved Hide resolved

Adjust module order in BG deploy

1ff3efc

LMCROSSITXSADEPLOY-3367

vkalapov force-pushed the bg-stop-reorder branch 2 times, most recently from d053a35 to 6e242eb Compare January 19, 2026 09:13

Add changes from comments

2f8b5de

vkalapov force-pushed the bg-stop-reorder branch from 6e242eb to 2f8b5de Compare January 19, 2026 12:28

s-yonkov-yonkov reviewed Jan 20, 2026

View reviewed changes

		<sequenceFlow id="sid-0F200B9A-6462-48CD-BA2D-6E6F1CE15D96" sourceRef="deleteIdleRoutesTask" targetRef="shouldManageServiceBroker"></sequenceFlow>
		<sequenceFlow id="skipDeleteIdleRoutesFlow" sourceRef="shouldDeleteIdleRoutes" targetRef="shouldManageServiceBroker"></sequenceFlow>

Bg stop reorder #1761

Are you sure you want to change the base?

Bg stop reorder #1761

Uh oh!

Conversation

vkalapov commented Jan 9, 2026

Uh oh!

Yavor16 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vkalapov Jan 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sonarqubecloud bot commented Jan 19, 2026

Quality Gate passed

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

vkalapov Jan 19, 2026 •

edited

Loading