Add preserve mta modules and provide rollback mechanism #1570

theghost5800 · 2024-12-06T11:22:02Z

Preserve applications during blue green deployment and add mechanism to revert older applications in working state

JIRA:LMCROSSITXSADEPLOY-3080

Yavor16 · 2024-12-06T13:00:51Z

.../main/java/org/cloudfoundry/multiapps/controller/persistence/dto/PreservedDescriptorDto.java

+    @Column(name = TableColumnNames.PRESERVED_DESCRIPTOR_DESCRIPTOR, nullable = false)
+    @Lob
+    private byte[] descriptor;


won't TEXT columns be better for large texts?

As we discuss in the chat, descriptors can have a lot of symbols and can exceed limit of TEXT datatype.

Yavor16 · 2024-12-06T13:43:33Z

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

+        context.setVariable(Variables.DEPLOYMENT_DESCRIPTOR, preservedDescriptor.getDescriptor());
+        context.setVariable(Variables.MTA_MAJOR_SCHEMA_VERSION, preservedDescriptor.getDescriptor()
+                                                                                   .getMajorSchemaVersion());
+        context.setVariable(Variables.MTA_ARCHIVE_MODULES, preservedDescriptor.getDescriptor()
+                                                                              .getModules()
+                                                                              .stream()
+                                                                              .map(Module::getName)
+                                                                              .collect(Collectors.toSet()));


why do you use three var-s when you could use only one?

Which three var's do you mean? They are set because it other steps are used for different things. Originally in blue-green process diagram, these vars are set in different steps but in rollback process diagram this can be achieved in single step

Yavor16 · 2024-12-06T13:43:56Z

...udfoundry/multiapps/controller/core/cf/util/ResourcesCloudModelBuilderContentCalculator.java

+        if (processOnlyUserProvidedService) {
+            return CloudModelBuilderUtil.isUserProvidedService(resource);
+        }
+        return true;


why if processOnlyUserProvidedService is false we still return true from the method

The issue here is with naming of the function. In this case we are looking to include all services in the list if "processOnlyUserProvidedService" flag is not set to true. I will think about another name.

Yavor16 · 2024-12-06T13:48:22Z

...java/org/cloudfoundry/multiapps/controller/process/steps/RemoveMtaPreservedMetadataStep.java

+        String mtaNamespace = context.getVariable(Variables.MTA_NAMESPACE);
+        String hashedMtaNamespace = mtaNamespace != null ? MtaMetadataUtil.getHashedLabel(mtaNamespace) : null;


should we do the same for the system namespace?

IvanBorislavovDimitrov · 2024-12-06T14:36:20Z

multiapps-controller-api/src/main/resources/mtarest.yaml

@@ -37,127 +37,6 @@ paths:
            $ref: "#/definitions/Info"
      security:


do not delete these

IvanBorislavovDimitrov · 2024-12-06T14:36:24Z

multiapps-controller-api/src/main/resources/mtarest.yaml

@@ -403,66 +282,6 @@ securityDefinitions:
    flow: "password"
    scopes: {}
 definitions:
-  AsyncUploadResult:


do not delete these

IvanBorislavovDimitrov · 2024-12-06T14:55:11Z

...rc/main/java/org/cloudfoundry/multiapps/controller/core/cf/v2/ServiceKeyMetadataBuilder.java

-        Builder builder = MtaMetadataBuilder.init(deploymentDescriptor, namespace)
-                                  .label(MtaMetadataLabels.SPACE_GUID, spaceGuid);
+
+        Builder builder = MtaMetadataBuilder.init(deploymentDescriptor, namespace, null)


why is null passed instead of namespace

IvanBorislavovDimitrov · 2024-12-06T14:55:17Z

...e/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/v2/ServiceMetadataBuilder.java

-        Builder builder = MtaMetadataBuilder.init(deploymentDescriptor, namespace)
-                                  .annotation(MtaMetadataAnnotations.MTA_RESOURCE, mtaResourceAnnotation);
+
+        Builder builder = MtaMetadataBuilder.init(deploymentDescriptor, namespace, null)


why is null passed instead of namespace

...in/java/org/cloudfoundry/multiapps/controller/core/model/BlueGreenApplicationNameSuffix.java

IvanBorislavovDimitrov · 2024-12-06T15:12:03Z

...in/resources/org/cloudfoundry/multiapps/controller/persistence/db/changelog/db-changelog.xml

@@ -33,4 +33,6 @@
    <include file="/org/cloudfoundry/multiapps/controller/persistence/db/changelog/db-changelog-1.167.0-persistence.xml" />

    <include file="/org/cloudfoundry/multiapps/controller/persistence/db/changelog/db-changelog-1.175.0-persistence.xml" />
+
+    <include file="/org/cloudfoundry/multiapps/controller/persistence/db/changelog/db-changelog-1.177.0-persistence.xml" />


reminder, update version

IvanBorislavovDimitrov · 2024-12-06T15:13:53Z

...ontroller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Constants.java

@@ -22,6 +23,8 @@ public class Constants {
    public static final String VAR_SERVICE_INSTANCE_GUID_PREFIX = "SERVICE_INSTANCE_GUID_";
    public static final String UNKNOWN_LABEL = "unknown label";
    public static final String UNKNOWN_PLAN = "unknown plan";
+    public static final String MTA_PRESERVED_NAMESPACE = "mta-preserved";
+    public static final String MTA_FOR_DELETION_PREFIX = "to-be-deleted";


reminder to update these

IvanBorislavovDimitrov · 2024-12-09T08:44:19Z

.../src/main/java/org/cloudfoundry/multiapps/controller/process/steps/MergeDescriptorsStep.java

+    private void preserveDeploymentDescriptor(ProcessContext context, DeploymentDescriptor descriptor) {
+        if (!context.getVariable(Variables.SHOULD_PRESERVE_OLD_APPS)) {
+            return;
+        }


can this be extracted in the diagram?

How? This step is used in all different type of deployment operations.

IvanBorislavovDimitrov · 2024-12-09T08:46:13Z

...rc/main/java/org/cloudfoundry/multiapps/controller/process/steps/RenameApplicationsStep.java

@@ -144,4 +156,45 @@ private void updateApplicationNamesInDescriptor(ProcessContext context, String s
        context.setVariable(Variables.DEPLOYMENT_DESCRIPTOR, descriptor);
    }

+    class RenameApplicationsForRevert implements RenameFlow {


this sounds like a method name, add Flow at the end?

IvanBorislavovDimitrov · 2024-12-09T08:49:14Z

.../java/org/cloudfoundry/multiapps/controller/process/util/ApplicationsPreserveCalculator.java

+    private final DeployedMta preservedMta;
+    private final DescriptorPreserverService descriptorPreserverService;
+
+    public ApplicationsPreserveCalculator(DeployedMta deployedMta, DeployedMta preservedMta,


add some logging in this class

Preserve applications during blue green deployment and add mechanism to revert older applications in working state JIRA:LMCROSSITXSADEPLOY-3080

…iptors

sonarqubecloud · 2024-12-20T13:56:44Z

Quality Gate failed

Failed conditions
72.2% Coverage on New Code (required ≥ 80%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

IvanBorislavovDimitrov

LGTM

Yavor16 reviewed Dec 6, 2024

View reviewed changes

IvanBorislavovDimitrov reviewed Dec 9, 2024

View reviewed changes

theghost5800 added 3 commits December 18, 2024 16:23

Add preserve mta modules and provide rollback mechanism

5560b68

Preserve applications during blue green deployment and add mechanism to revert older applications in working state JIRA:LMCROSSITXSADEPLOY-3080

Rename all commands and prefixes

08ddf4b

Fix comments and change names

9a19c8d

theghost5800 force-pushed the revertPoc branch from fc64e7f to 9a19c8d Compare December 18, 2024 14:24

Compare only mta version instead calculating checksum of merged descr…

6b3faa1

…iptors

Yavor16 approved these changes Dec 23, 2024

View reviewed changes

IvanBorislavovDimitrov approved these changes Dec 23, 2024

View reviewed changes

Yavor16 merged commit a54feca into master Jan 6, 2025
6 of 7 checks passed

Yavor16 deleted the revertPoc branch January 6, 2025 14:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add preserve mta modules and provide rollback mechanism #1570

Add preserve mta modules and provide rollback mechanism #1570

theghost5800 commented Dec 6, 2024

Yavor16 Dec 6, 2024

theghost5800 Dec 17, 2024

Yavor16 Dec 6, 2024

theghost5800 Dec 17, 2024 •

edited

Loading

Yavor16 Dec 6, 2024

theghost5800 Dec 17, 2024

Yavor16 Dec 6, 2024

IvanBorislavovDimitrov Dec 6, 2024

IvanBorislavovDimitrov Dec 6, 2024

IvanBorislavovDimitrov Dec 6, 2024

IvanBorislavovDimitrov Dec 6, 2024

IvanBorislavovDimitrov Dec 6, 2024

IvanBorislavovDimitrov Dec 6, 2024

IvanBorislavovDimitrov Dec 9, 2024

theghost5800 Dec 18, 2024

IvanBorislavovDimitrov Dec 9, 2024

IvanBorislavovDimitrov Dec 9, 2024

sonarqubecloud bot commented Dec 20, 2024

IvanBorislavovDimitrov left a comment

		String mtaNamespace = context.getVariable(Variables.MTA_NAMESPACE);
		String hashedMtaNamespace = mtaNamespace != null ? MtaMetadataUtil.getHashedLabel(mtaNamespace) : null;

		@@ -37,127 +37,6 @@ paths:
		$ref: "#/definitions/Info"
		security:

Add preserve mta modules and provide rollback mechanism #1570

Add preserve mta modules and provide rollback mechanism #1570

Conversation

theghost5800 commented Dec 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

theghost5800 Dec 17, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Dec 20, 2024

Quality Gate failed

IvanBorislavovDimitrov left a comment

Choose a reason for hiding this comment

theghost5800 Dec 17, 2024 •

edited

Loading