[WFCORE-6893] Add information to product-info #6070

spyrkob · 2024-07-11T13:51:58Z

Issue: https://issues.redhat.com/browse/WFCORE-6893

Note: Setting as draft, because it requires wildfly-extras/wildfly-installation-manager-api#21
Related: wildfly-extras/prospero#720

spyrkob · 2024-07-11T13:53:27Z

@yersan could you take a look at this? I created a hidden/private operation handler for the installation manager history that is called from both the :product-info and installer history operation handlers.

wildfly-ci · 2024-07-11T13:56:30Z

Core -> WildFly Preview Integration Build 13733 outcome was FAILURE using a merge of dacd47c
Summary: Exit code 1 (Step: Build core (Maven)) (new) Build time: 00:01:25

wildfly-ci · 2024-07-11T13:56:34Z

Core -> Full Integration Build 13661 outcome was FAILURE using a merge of dacd47c
Summary: Exit code 1 (Step: Build core (Maven)) (new) Build time: 00:01:28

wildfly-ci · 2024-07-11T13:56:51Z

Core -> Full Integration Build 13948 outcome was FAILURE using a merge of dacd47c
Summary: Exit code 1 (Step: Build core (Maven)) (new) Build time: 00:01:47

yersan

@spyrkob I'm going to pick up this work and try to find an approach that does not require splitting the history handler into two versions

yersan · 2024-07-15T10:44:53Z

installation-manager/src/main/java/org/wildfly/core/instmgr/InstMgrHistoryHandler.java

+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.CORE_SERVICE;
+


Static import is out of order, they go at the beginning. I thought this was described in our IDE templates, but I have not found it. So, could you check your IDE and use the following import order:

static imports
blank line
import java.*
blank line
import javax.*
blank line
import jakarta.*
blank line
Other imports alphabetically

yersan · 2024-07-15T11:48:13Z

installation-manager/src/main/java/org/wildfly/core/instmgr/InstMgrHistoryHandler.java

+        OperationEntry installerOpEntry = context.getRootResourceRegistration().getOperationEntry(installerAddress, "history-runtime");
+        context.addStep(installerOpEntry.getOperationHandler(), OperationContext.Stage.RUNTIME);


We have to find a better approach that does not require splitting the history handle into "history-runtime" and "history", both handlers do the same, in addition, the InstallationReportHandler.java host version uses history and the server version the history-handler. I'll take a closed look to find a better approach.

yersan · 2024-07-15T11:51:49Z

installation-manager/src/main/java/org/wildfly/core/instmgr/InstMgrHistoryRuntimeHandler.java

+
+    @Override
+    public void execute(OperationContext context, ModelNode operation) throws OperationFailedException {
+        try {


Just for yuour info, even if this operation has the .setRuntimeOnly() flag, this execute method is executed at Model stage.

yersan · 2024-07-16T10:59:47Z

Finally, it was decided to use addFirst trick on the installation manager history handler to coordinate the execution, context about the discussion can be found in Zulip

spyrkob · 2024-07-16T14:01:18Z

@yersan should Il keep this as draft until the installation-manager 1.0.3.Final is out and update it in this PR?

wildfly-ci · 2024-07-16T14:01:45Z

Core -> Full Integration Build 13668 outcome was FAILURE using a merge of bd81049
Summary: Exit code 1 (Step: Build core (Maven)) Build time: 00:01:38

wildfly-ci · 2024-07-16T14:02:03Z

Core -> Full Integration Build 13955 outcome was FAILURE using a merge of bd81049
Summary: Exit code 1 (Step: Build core (Maven)) Build time: 00:01:56

wildfly-ci · 2024-07-16T14:02:10Z

Core -> WildFly Preview Integration Build 13740 outcome was FAILURE using a merge of bd81049
Summary: Exit code 1 (Step: Build core (Maven)) Build time: 00:02:03

yersan · 2024-07-16T14:27:29Z

@spyrkob Ideally yes, we can release installation-manager once we test this PR together with Prospero. Then we bump it on wildfly core and this would be rebased so we can proceed with the merge. We would need to test the operation when Prospero (or the installation manager test version) is enabled

yersan · 2024-07-16T14:43:16Z

@spyrkob Talking about testing strategy, this is what we have so far:

Management Operation unit tests: https://github.com/wildfly/wildfly-core/blob/main/installation-manager/src/test/java/org/wildfly/core/instmgr/InstMgrResourceTestCase.java
High-level commands using domain mode. See https://github.com/wildfly/wildfly-core/blob/main/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/installationmanager/InstallationManagerIntegrationTestCase.java#L104-L110, we create a specific module to make the mock available in the server. We could do the same for a standalone instance so we can test the :product-info management operation on both standalone and Domain Mode when Prospero is available via WildFly Core Installation Manager.

Share your feedback if you see a better testing strategy, real provisioning with Prospero for testing seems more tricky since this is only WildFly Core and we do not want to be tight to one Prospero version, here we are only testing until the Prospero API invocation.

spyrkob · 2024-07-17T09:45:25Z

@yersan I added tests to check that the correct information is added to the product info and installer history. I based the integration tests for standalone mode on the existing domain tests. I'm not sure if there's a better way to avoid the code duplication between the two

wildfly-ci · 2024-07-17T09:46:34Z

Core -> Full Integration Build 13961 outcome was FAILURE using a merge of 8b38f17
Summary: Exit code 1 (Step: Build core (Maven)) Build time: 00:01:29

wildfly-ci · 2024-07-17T09:46:52Z

Core -> WildFly Preview Integration Build 13746 outcome was FAILURE using a merge of 8b38f17
Summary: Exit code 1 (Step: Build core (Maven)) Build time: 00:01:47

wildfly-ci · 2024-07-17T09:46:54Z

Core -> Full Integration Build 13674 outcome was FAILURE using a merge of 8b38f17
Summary: Exit code 1 (Step: Build core (Maven)) Build time: 00:01:49

yersan · 2024-07-18T13:54:11Z

I'm not sure if there's a better way to avoid code duplication between the two

@spyrkob I think it could have been enough by just adding the :product-info operation test to the standalone version. The code path for domain mode and standalone is the same, the only difference is that the standalone address is /core-service=installer instead of /host=name/core-service=installer, but server handlers are the same, CLI handlers just add the host name.

It is good to get both covered though, but if we do it, I guess we should remove the duplication (which can be done later). We can use this directory https://github.com/wildfly/wildfly-core/tree/main/testsuite/shared/src/main/java/org/wildfly/test/installationmanager to place a base class that accepts a list of host names and inherit both test claasses from that base class, the domain one will add the hosts to the test methods.

It is ok to me if this is done after this fix, I leave it up to you. If not we can create a Jira to do it later.

yersan

Looks good to me, there are two minor details, the one about test duplicity, up to you can be done later, and the minor about the date format of the timestamp.

I'm going to merge and release the one of the installation manager API, to get it later available here

yersan · 2024-07-18T14:28:19Z

server/src/main/java/org/jboss/as/server/operations/AbstractInstallationReporter.java

+                List<ModelNode> result = Operations.readResult(installerInfo).asList();
+                for (ModelNode installerAtt : result) {
+                    if (installerAtt.has("timestamp")) {
+                        return installerAtt.get("timestamp").asString();


We should keep the format given by the legacy tool:

wildfly-core/patching/src/main/java/org/jboss/as/patching/runner/PatchUtils.java

Line 200 in 69e4d2a

return DateFormat.getInstance().format(new Date());

OK that probably should happen in InstMgrHistoryHandler, in the Reporter it's too late - we already have a text value

spyrkob · 2024-07-22T08:39:32Z

/retest

github-actions · 2024-09-29T00:57:50Z

There has been no activity on this PR for 45 days. It will be auto-closed after 90 days.

…gration

yersan requested changes Jul 15, 2024

View reviewed changes

spyrkob force-pushed the WFCORE-6893 branch from dacd47c to bd81049 Compare July 16, 2024 13:59

yersan requested changes Jul 18, 2024

View reviewed changes

github-actions bot added the deps-ok Dependencies have been checked, and there are no significant changes label Jul 19, 2024

This comment was marked as outdated.

Sign in to view

spyrkob force-pushed the WFCORE-6893 branch from cc00291 to d4fd454 Compare July 24, 2024 14:50

This comment was marked as outdated.

Sign in to view

spyrkob force-pushed the WFCORE-6893 branch 2 times, most recently from e921710 to ff49019 Compare July 26, 2024 14:42

spyrkob force-pushed the WFCORE-6893 branch from ff49019 to a5e426e Compare August 8, 2024 12:14

spyrkob marked this pull request as ready for review August 9, 2024 11:34

github-actions bot added the Stale label Sep 29, 2024

spyrkob added 3 commits October 23, 2024 14:42

[WFCORE-6893] Add information to product-info

77e11db

[WFCORE-6893] Add standalone mode tests for installation manager inte…

4a3fda6

…gration

Extracting common code in InstallationManagerTestCase

2f17da0

spyrkob force-pushed the WFCORE-6893 branch from a5e426e to 2f17da0 Compare October 23, 2024 13:44

github-actions bot removed the Stale label Oct 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WFCORE-6893] Add information to product-info #6070

[WFCORE-6893] Add information to product-info #6070

spyrkob commented Jul 11, 2024 •

edited by yersan

Loading

spyrkob commented Jul 11, 2024

wildfly-ci commented Jul 11, 2024

wildfly-ci commented Jul 11, 2024

wildfly-ci commented Jul 11, 2024

yersan left a comment

yersan Jul 15, 2024

yersan Jul 15, 2024

yersan Jul 15, 2024

yersan commented Jul 16, 2024

spyrkob commented Jul 16, 2024

wildfly-ci commented Jul 16, 2024

wildfly-ci commented Jul 16, 2024

wildfly-ci commented Jul 16, 2024

yersan commented Jul 16, 2024 •

edited

Loading

yersan commented Jul 16, 2024 •

edited

Loading

spyrkob commented Jul 17, 2024

wildfly-ci commented Jul 17, 2024

wildfly-ci commented Jul 17, 2024

wildfly-ci commented Jul 17, 2024

yersan commented Jul 18, 2024

yersan left a comment

yersan Jul 18, 2024

spyrkob Jul 19, 2024

This comment was marked as outdated.

spyrkob commented Jul 22, 2024

This comment was marked as outdated.

github-actions bot commented Sep 29, 2024

		import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.CORE_SERVICE;

		OperationEntry installerOpEntry = context.getRootResourceRegistration().getOperationEntry(installerAddress, "history-runtime");
		context.addStep(installerOpEntry.getOperationHandler(), OperationContext.Stage.RUNTIME);

[WFCORE-6893] Add information to product-info #6070

Are you sure you want to change the base?

[WFCORE-6893] Add information to product-info #6070

Conversation

spyrkob commented Jul 11, 2024 • edited by yersan Loading

spyrkob commented Jul 11, 2024

wildfly-ci commented Jul 11, 2024

wildfly-ci commented Jul 11, 2024

wildfly-ci commented Jul 11, 2024

yersan left a comment

Choose a reason for hiding this comment

yersan Jul 15, 2024

Choose a reason for hiding this comment

yersan Jul 15, 2024

Choose a reason for hiding this comment

yersan Jul 15, 2024

Choose a reason for hiding this comment

yersan commented Jul 16, 2024

spyrkob commented Jul 16, 2024

wildfly-ci commented Jul 16, 2024

wildfly-ci commented Jul 16, 2024

wildfly-ci commented Jul 16, 2024

yersan commented Jul 16, 2024 • edited Loading

yersan commented Jul 16, 2024 • edited Loading

spyrkob commented Jul 17, 2024

wildfly-ci commented Jul 17, 2024

wildfly-ci commented Jul 17, 2024

wildfly-ci commented Jul 17, 2024

yersan commented Jul 18, 2024

yersan left a comment

Choose a reason for hiding this comment

yersan Jul 18, 2024

Choose a reason for hiding this comment

spyrkob Jul 19, 2024

Choose a reason for hiding this comment

This comment was marked as outdated.

spyrkob commented Jul 22, 2024

This comment was marked as outdated.

github-actions bot commented Sep 29, 2024

spyrkob commented Jul 11, 2024 •

edited by yersan

Loading

yersan commented Jul 16, 2024 •

edited

Loading

yersan commented Jul 16, 2024 •

edited

Loading