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.

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

[RHDM-2029] Executable model doesn't report an error when duplicated … #58

Closed
wants to merge 2 commits into from

Conversation

tkobayas
Copy link

…rule name with "include" kbase

Ports
This PR is for 7.x
7.67.x ->

JIRA:
https://issues.redhat.com/browse/RHDM-2029

How to replicate CI configuration locally?

Build Chain tool does "simple" maven build(s), the builds are just Maven commands, but because the repositories relates and depends on each other and any change in API or class method could affect several of those repositories there is a need to use build-chain tool to handle cross repository builds and be sure that we always use latest version of the code for each repository.

build-chain tool is a build tool which can be used on command line locally or in Github Actions workflow(s), in case you need to change multiple repositories and send multiple dependent pull requests related with a change you can easily reproduce the same build by executing it on Github hosted environment or locally in your development environment. See local execution details to get more information about it.

How to retest this PR or trigger a specific build:
  • for pull request checks
    Please add comment: Jenkins retest this

  • for a specific pull request check
    Please add comment: Jenkins (re)run [drools|kogito-runtimes|kogito-apps|kogito-examples] tests

  • for a full downstream build

    • for jenkins job: please add comment: Jenkins run fdb
    • for github actions job: add the label run_fdb
  • a compile downstream build please add comment: Jenkins run cdb

  • a full production downstream build please add comment: Jenkins execute product fdb

  • an upstream build please add comment: Jenkins run upstream

  • for quarkus branch checks
    Run checks against Quarkus current used branch
    Please add comment: Jenkins run quarkus-branch

  • for a quarkus branch specific check
    Run checks against Quarkus current used branch
    Please add comment: Jenkins (re)run [drools|kogito-runtimes|kogito-apps|kogito-examples] quarkus-branch

  • for quarkus main checks
    Run checks against Quarkus main branch
    Please add comment: Jenkins run quarkus-main

  • for a specific quarkus main check
    Run checks against Quarkus main branch
    Please add comment: Jenkins (re)run [drools|kogito-runtimes|kogito-apps|kogito-examples] quarkus-main

  • for quarkus lts checks
    Run checks against Quarkus lts branch
    Please add comment: Jenkins run quarkus-lts

  • for a specific quarkus lts check
    Run checks against Quarkus lts branch
    Please add comment: Jenkins (re)run [drools|kogito-runtimes|kogito-apps|kogito-examples] quarkus-lts

  • for native checks
    Run native checks
    Please add comment: Jenkins run native

  • for a specific native check
    Run native checks
    Please add comment: Jenkins (re)run [drools|kogito-runtimes|kogito-apps|kogito-examples] native

  • for native lts checks
    Run native checks against quarkus lts branch
    Please add comment: Jenkins run native-lts

  • for a specific native lts check
    Run native checks against quarkus lts branch
    Please add comment: Jenkins (re)run [drools|kogito-runtimes|kogito-apps|kogito-examples] native-lts

How to backport a pull request to a different branch?

In order to automatically create a backporting pull request please add one or more labels having the following format backport-<branch-name>, where <branch-name> is the name of the branch where the pull request must be backported to (e.g., backport-7.67.x to backport the original PR to the 7.67.x branch).

NOTE: backporting is an action aiming to move a change (usually a commit) from a branch (usually the main one) to another one, which is generally referring to a still maintained release branch. Keeping it simple: it is about to move a specific change or a set of them from one branch to another.

Once the original pull request is successfully merged, the automated action will create one backporting pull request per each label (with the previous format) that has been added.

If something goes wrong, the author will be notified and at this point a manual backporting is needed.

NOTE: this automated backporting is triggered whenever a pull request on main branch is labeled or closed, but both conditions must be satisfied to get the new PR created.

Comment on lines +341 to +347
KieContainer kieContainer = ks.newKieContainer(internalReleaseId);
KieBase kieBase = kieContainer.getKieBase(kBaseName);
// add rule names to ruleNamesInIncludeKBases
kieBase.getKiePackages().stream()
.filter(kPkg -> kPkg.getName().equals(packageDescr.getNamespace()))
.flatMap(kPkg -> kPkg.getRules().stream())
.forEach(rule -> ruleNamesInIncludeKBases.add(rule.getName()));
Copy link
Author

@tkobayas tkobayas Jun 19, 2024

Choose a reason for hiding this comment

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

This may be a naive approach to collect rule names (= build kbase and get rules), but I cannot find a way to collect them directly from the "included kbase"'s KieModule.

There may be a case that we can get cached PackageDescr/RuleDescr of the included kbase.

    KnowledgeBuilder knowledgeBuilder = includeModule.getKnowledgeBuilderForKieBase(kBaseName);
    List<PackageDescr> includePackageDescrs = ((ModelBuilderImpl) knowledgeBuilder).getPackageDescrs(packageDescr.getNamespace());

but it's not possible in case of kie-maven-plugin use case (getKnowledgeBuilderForKieBase returns InternalKnowledgeBuilder$Empty)

WDYT, @mariofusco ?

Copy link
Member

Choose a reason for hiding this comment

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

This works, but in all honesty it seems also to be a huge amount of wasteful computational resources that moreover needs to happen again and again for each and every PackageDescr check. Just to figure out if we could find a better way to do this can you please point me to what does the non-exec model version? At the moment I don't understand why the interpreted version performs the names duplication check correctly while the exec model one doesn't. Also I wonder if we can make this more efficient by delaying this check at a later stage, maybe when the KieBase is created?

Copy link
Author

@tkobayas tkobayas Jun 20, 2024

Choose a reason for hiding this comment

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

can you please point me to what does the non-exec model version?

https://github.com/kiegroup/drools/blob/7.x/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/AbstractKieProject.java#L237-L239

non-exec model (compileIncludedKieBases() returns true) adds files of "included kbase" module into assets, so all of them will be parsed and compiled. Thus, it can validate the rule name duplication with KnowledgeBuilderImpl.validateUniqueRuleNames.

it seems also to be a huge amount of wasteful computational resources

Yes. Now #59 creates only KiePackage, instead of KieBase, so I hope it's relatively smaller.

needs to happen again and again for each and every PackageDescr check

Thank you for pointing this out. I have moved populateIncludedRuleNameMap() out of packages loop in #59, so executed only once.

Also I wonder if we can make this more efficient by delaying this check at a later stage, maybe when the KieBase is created?

Sure, I'm going to do it as another PR. Note that it means the duplication cannot be detected at the time of kjar build by kie-maven-plugin, right?

@tkobayas tkobayas marked this pull request as draft June 19, 2024 07:31
@tkobayas tkobayas marked this pull request as ready for review June 19, 2024 08:24
@tkobayas
Copy link
Author

Jenkins: Pull Request : Flaky test

[2024-06-19T08:38:14.108Z] [ERROR] Tests run: 10, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 20.206 s <<< FAILURE! - in org.drools.mvel.integrationtests.KieContainerTest
[2024-06-19T08:38:14.108Z] [ERROR] testIncrementalCompilationSynchronization[KieBase type=CLOUD_IDENTITY](org.drools.mvel.integrationtests.KieContainerTest)  Time elapsed: 20.041 s  <<< ERROR!
[2024-06-19T08:38:14.108Z] org.junit.runners.model.TestTimedOutException: test timed out after 20000 milliseconds

}

public Map<String, InternalKieModule> getIncludeModules() {
return new HashMap<>();
Copy link
Member

Choose a reason for hiding this comment

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

It would better to return Collections.emptyMap() here instead of creating a new map at each invocation.

Copy link
Author

Choose a reason for hiding this comment

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

Thanks! Fixed in #59

@tkobayas
Copy link
Author

tkobayas commented Jun 19, 2024

I created a variant: #59 using canonicalKieModule.getKiePackages() rather than getKieBase(). This one is better?

I'm sorry, there is a test failure on the PR59. I'll re-investigate the approach tomorrow with a fresh view. Sorry for bothering you... Fixed

@mariofusco
Copy link
Member

Replaced by #59

@mariofusco mariofusco closed this Jun 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants