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.

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

Jump to bottom

Make sure the registry ordering reflects the priority for the platform selection algorithm #18800

Merged
merged 1 commit into from
Jul 19, 2021
Merged

Make sure the registry ordering reflects the priority for the platform selection algorithm #18800

merged 1 commit into from
Jul 19, 2021

Conversation

aloubyansky
Copy link
Member

This PR fixes a couple of issues when selecting platforms for project creation. Specifically, it makes sure the platform stream/version containing most of the requested extensions is preferred even if it's not the latest available stream/version.
Also fixes addition of extensions to the already existing platforms by allowing to query the registries for extensions from platforms that aren't imported by the project.

@aloubyansky
Make sure the registry ordering reflects the priority for the platfor…
6064e9a 
…m selection

algorythm and the platform stream/version containing most of the
requested extensions is preferred.
@quarkus-bot quarkus-bot bot added area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/gradle Gradle area/maven area/platform Issues related to definition and interaction with Quarkus Platform labels Jul 19, 2021
gastaldi
gastaldi reviewed Jul 19, 2021
View reviewed changes
...ndent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsUtils.java
final OriginPreference originPreference = new OriginPreference(1, 1, 1, ++memberIndex, 1);
Map<String, Object> metadata = memberCatalog.getMetadata();
if (metadata.isEmpty()) {
metadata = new HashMap<>();
Copy link
Contributor

Choose a reason for hiding this comment

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

Why create a new instance if the metadata is empty already?

Copy link
Member Author

Choose a reason for hiding this comment

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

https://github.com/quarkusio/quarkus/blob/main/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonExtensionCatalog.java#L88
I should probably initialize it to new HashMap<>(0) in the JsonExtensionCatalog and remove this ugliness.

gastaldi
gastaldi approved these changes Jul 19, 2021
View reviewed changes
Copy link
Contributor

@gastaldi gastaldi left a comment

Choose a reason for hiding this comment

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

LGTM, just added a minor observation

@quarkus-bot
Copy link

quarkus-bot bot commented Jul 19, 2021

Failing Jobs - Building 6064e9a

Status Name Step Test failures Logs Raw logs
✖ MicroProfile TCKs Tests Verify Test failures Logs Raw logs

Full information is available in the Build summary check run.

Test Failures

⚙️ MicroProfile TCKs Tests #

📦 tcks/microprofile-fault-tolerance

✖ org.eclipse.microprofile.fault.tolerance.tck.TimeoutUninterruptableTest.testTimeoutAsyncBulkhead line 190 - More details - Source on GitHub

java.lang.AssertionError: Unexpected exception thrown from Future
	at org.testng.Assert.fail(Assert.java:85)
	at org.eclipse.microprofile.fault.tolerance.tck.util.Exceptions.expect(Exceptions.java:98)
	at org.eclipse.microprofile.fault.tolerance.tck.TimeoutUninterruptableTest.testTimeoutAsyncBulkhead(TimeoutUninterruptableTest.java:190)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
	at io.quarkus.arquillian.QuarkusProtocol$QuarkusMethodExecutor$1.invoke(QuarkusProtocol.java:87)
	at org.jboss.arquillian.container.test.impl.execution.LocalTestExecuter.execute(LocalTestExecuter.java:57)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
	at org.jboss.arquillian.core.impl.ObserverImpl.invoke(ObserverImpl.java:86)
	at org.jboss.arquillian.core.impl.EventContextImpl.invokeObservers(EventContextImpl.java:103)
	at org.jboss.arquillian.core.impl.EventContextImpl.proceed(EventCon...

@aloubyansky aloubyansky merged commit 24e6793 into quarkusio:main Jul 19, 2021
@quarkus-bot quarkus-bot bot added this to the 2.2 - main milestone Jul 19, 2021
@gastaldi gastaldi mentioned this pull request Jul 19, 2021
Merged
@gsmet gsmet modified the milestones: 2.2 - main, 2.1.0.Final Jul 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gastaldi gastaldi gastaldi approved these changes

@ia3andy ia3andy Awaiting requested review from ia3andy

@ebullient ebullient Awaiting requested review from ebullient

Assignees
No one assigned
Labels
area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/gradle Gradle area/maven area/platform Issues related to definition and interaction with Quarkus Platform
Projects
None yet
Milestone
2.1.0.Final
Development

Successfully merging this pull request may close these issues.
3 participants
@aloubyansky @gastaldi @gsmet