You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by GitBox <gi...@apache.org> on 2021/06/24 00:31:56 UTC
[GitHub] [camel-quarkus] ffang opened a new pull request #2841: Fix InfinispanTest failed on Mac #2840
ffang opened a new pull request #2841:
URL: https://github.com/apache/camel-quarkus/pull/2841
<!-- Uncomment and fill this section if your PR is not trivial
[ ] An issue should be filed for the change unless this is a trivial change (fixing a typo or similar). One issue should ideally be fixed by not more than one commit and the other way round, each commit should fix just one issue, without pulling in other changes.
[ ] Each commit in the pull request should have a meaningful and properly spelled subject line and body. Copying the title of the associated issue is typically enough. Please include the issue number in the commit message prefixed by #.
[ ] The pull request description should explain what the pull request does, how, and why. If the info is available in the associated issue or some other external document, a link is enough.
[ ] Phrases like Fix #<issueNumber> or Fixes #<issueNumber> will auto-close the named issue upon merging the pull request. Using them is typically a good idea.
[ ] Please run mvn process-resources -Pformat (and amend the changes if necessary) before sending the pull request.
[ ] Contributor guide is your good friend: https://camel.apache.org/camel-quarkus/latest/contributor-guide.html
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] ffang commented on pull request #2841: Fix InfinispanTest failed on Mac #2840
Posted by GitBox <gi...@apache.org>.
ffang commented on pull request #2841:
URL: https://github.com/apache/camel-quarkus/pull/2841#issuecomment-867644337
> I prefer the `SystemUtils.IS_OS_MAC` as suggested by @ppalaga.
> Because, we don't know if the `result.put("quarkus.infinispan-client.client-intelligence", "BASIC");` is valid for all non OS_LINUX.
Hi @zbendhiba ,
At least for windows we also need this property, please see this discussion
https://stackoverflow.com/questions/63465221/running-infinispan-in-docker-on-windows-10
Cheers
Freeman
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] ffang commented on pull request #2841: Fix InfinispanTest failed on Mac #2840
Posted by GitBox <gi...@apache.org>.
ffang commented on pull request #2841:
URL: https://github.com/apache/camel-quarkus/pull/2841#issuecomment-867670597
addressed feedback and squashed new commit https://github.com/apache/camel-quarkus/pull/2841/commits/1718479a0da7a7ac9bbf1d71502ad6aefcf1d35d
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] ffang commented on a change in pull request #2841: Fix InfinispanTest failed on Mac #2840
Posted by GitBox <gi...@apache.org>.
ffang commented on a change in pull request #2841:
URL: https://github.com/apache/camel-quarkus/pull/2841#discussion_r657955582
##########
File path: integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
##########
@@ -54,24 +55,48 @@
// Create 2 sets of configuration to test scenarios:
// - Quarkus Infinispan client bean being autowired into the Camel Infinispan component
// - Component configuration where the Infinispan client is managed by Camel (E.g Infinispan client autowiring disabled)
- return CollectionHelper.mapOf(
- // quarkus
- "quarkus.infinispan-client.server-list", serverList,
- "quarkus.infinispan-client.near-cache-max-entries", "3",
- "quarkus.infinispan-client.auth-username", USER,
- "quarkus.infinispan-client.auth-password", PASS,
- "quarkus.infinispan-client.auth-realm", "default",
- "quarkus.infinispan-client.sasl-mechanism", "DIGEST-MD5",
- "quarkus.infinispan-client.auth-server-name", "infinispan",
- // camel
- "camel.component.infinispan.autowired-enabled", "false",
- "camel.component.infinispan.hosts", serverList,
- "camel.component.infinispan.username", USER,
- "camel.component.infinispan.password", PASS,
- "camel.component.infinispan.secure", "true",
- "camel.component.infinispan.security-realm", "default",
- "camel.component.infinispan.sasl-mechanism", "DIGEST-MD5",
- "camel.component.infinispan.security-server-name", "infinispan");
+ if (SystemUtils.IS_OS_LINUX) {
+ return CollectionHelper.mapOf(
+ // quarkus
+ "quarkus.infinispan-client.server-list", serverList,
+ "quarkus.infinispan-client.near-cache-max-entries", "3",
+ "quarkus.infinispan-client.auth-username", USER,
+ "quarkus.infinispan-client.auth-password", PASS,
+ "quarkus.infinispan-client.auth-realm", "default",
+ "quarkus.infinispan-client.sasl-mechanism", "DIGEST-MD5",
+ "quarkus.infinispan-client.auth-server-name", "infinispan",
+ // camel
+ "camel.component.infinispan.autowired-enabled", "false",
+ "camel.component.infinispan.hosts", serverList,
+ "camel.component.infinispan.username", USER,
+ "camel.component.infinispan.password", PASS,
+ "camel.component.infinispan.secure", "true",
+ "camel.component.infinispan.security-realm", "default",
+ "camel.component.infinispan.sasl-mechanism", "DIGEST-MD5",
+ "camel.component.infinispan.security-server-name",
+ "infinispan");
+ } else {
+ return CollectionHelper.mapOf(
+ // quarkus
+ "quarkus.infinispan-client.server-list", serverList,
+ "quarkus.infinispan-client.near-cache-max-entries", "3",
+ "quarkus.infinispan-client.auth-username", USER,
+ "quarkus.infinispan-client.auth-password", PASS,
+ "quarkus.infinispan-client.auth-realm", "default",
+ "quarkus.infinispan-client.sasl-mechanism", "DIGEST-MD5",
+ "quarkus.infinispan-client.auth-server-name", "infinispan",
+ "quarkus.infinispan-client.client-intelligence", "BASIC",
+ // camel
+ "camel.component.infinispan.autowired-enabled", "false",
+ "camel.component.infinispan.hosts", serverList,
+ "camel.component.infinispan.username", USER,
+ "camel.component.infinispan.password", PASS,
+ "camel.component.infinispan.secure", "true",
+ "camel.component.infinispan.security-realm", "default",
+ "camel.component.infinispan.sasl-mechanism", "DIGEST-MD5",
+ "camel.component.infinispan.security-server-name",
+ "infinispan");
+ }
Review comment:
Hi @ppalaga ,
Thanks for the feedback and I will go this way.
I think we need to add this property for windows machine as well. The root cause is same for windows and mac. The Docker desktop can't route request to internal docker IP directly on mac and windows.
Please see this discussion
https://stackoverflow.com/questions/63465221/running-infinispan-in-docker-on-windows-10
Freeman
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on a change in pull request #2841: Fix InfinispanTest failed on Mac #2840
Posted by GitBox <gi...@apache.org>.
ppalaga commented on a change in pull request #2841:
URL: https://github.com/apache/camel-quarkus/pull/2841#discussion_r657964926
##########
File path: integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
##########
@@ -54,24 +55,48 @@
// Create 2 sets of configuration to test scenarios:
// - Quarkus Infinispan client bean being autowired into the Camel Infinispan component
// - Component configuration where the Infinispan client is managed by Camel (E.g Infinispan client autowiring disabled)
- return CollectionHelper.mapOf(
- // quarkus
- "quarkus.infinispan-client.server-list", serverList,
- "quarkus.infinispan-client.near-cache-max-entries", "3",
- "quarkus.infinispan-client.auth-username", USER,
- "quarkus.infinispan-client.auth-password", PASS,
- "quarkus.infinispan-client.auth-realm", "default",
- "quarkus.infinispan-client.sasl-mechanism", "DIGEST-MD5",
- "quarkus.infinispan-client.auth-server-name", "infinispan",
- // camel
- "camel.component.infinispan.autowired-enabled", "false",
- "camel.component.infinispan.hosts", serverList,
- "camel.component.infinispan.username", USER,
- "camel.component.infinispan.password", PASS,
- "camel.component.infinispan.secure", "true",
- "camel.component.infinispan.security-realm", "default",
- "camel.component.infinispan.sasl-mechanism", "DIGEST-MD5",
- "camel.component.infinispan.security-server-name", "infinispan");
+ if (SystemUtils.IS_OS_LINUX) {
+ return CollectionHelper.mapOf(
+ // quarkus
+ "quarkus.infinispan-client.server-list", serverList,
+ "quarkus.infinispan-client.near-cache-max-entries", "3",
+ "quarkus.infinispan-client.auth-username", USER,
+ "quarkus.infinispan-client.auth-password", PASS,
+ "quarkus.infinispan-client.auth-realm", "default",
+ "quarkus.infinispan-client.sasl-mechanism", "DIGEST-MD5",
+ "quarkus.infinispan-client.auth-server-name", "infinispan",
+ // camel
+ "camel.component.infinispan.autowired-enabled", "false",
+ "camel.component.infinispan.hosts", serverList,
+ "camel.component.infinispan.username", USER,
+ "camel.component.infinispan.password", PASS,
+ "camel.component.infinispan.secure", "true",
+ "camel.component.infinispan.security-realm", "default",
+ "camel.component.infinispan.sasl-mechanism", "DIGEST-MD5",
+ "camel.component.infinispan.security-server-name",
+ "infinispan");
+ } else {
+ return CollectionHelper.mapOf(
+ // quarkus
+ "quarkus.infinispan-client.server-list", serverList,
+ "quarkus.infinispan-client.near-cache-max-entries", "3",
+ "quarkus.infinispan-client.auth-username", USER,
+ "quarkus.infinispan-client.auth-password", PASS,
+ "quarkus.infinispan-client.auth-realm", "default",
+ "quarkus.infinispan-client.sasl-mechanism", "DIGEST-MD5",
+ "quarkus.infinispan-client.auth-server-name", "infinispan",
+ "quarkus.infinispan-client.client-intelligence", "BASIC",
+ // camel
+ "camel.component.infinispan.autowired-enabled", "false",
+ "camel.component.infinispan.hosts", serverList,
+ "camel.component.infinispan.username", USER,
+ "camel.component.infinispan.password", PASS,
+ "camel.component.infinispan.secure", "true",
+ "camel.component.infinispan.security-realm", "default",
+ "camel.component.infinispan.sasl-mechanism", "DIGEST-MD5",
+ "camel.component.infinispan.security-server-name",
+ "infinispan");
+ }
Review comment:
Thanks, sounds good.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] zbendhiba commented on pull request #2841: Fix InfinispanTest failed on Mac #2840
Posted by GitBox <gi...@apache.org>.
zbendhiba commented on pull request #2841:
URL: https://github.com/apache/camel-quarkus/pull/2841#issuecomment-867364797
I prefer the `SystemUtils.IS_OS_MAC` as suggested by @ppalaga.
Because, we don't know if the `result.put("quarkus.infinispan-client.client-intelligence", "BASIC");` is valid for all non OS_LINUX.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] ffang commented on pull request #2841: Fix InfinispanTest failed on Mac #2840
Posted by GitBox <gi...@apache.org>.
ffang commented on pull request #2841:
URL: https://github.com/apache/camel-quarkus/pull/2841#issuecomment-868832364
Thanks All!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on a change in pull request #2841: Fix InfinispanTest failed on Mac #2840
Posted by GitBox <gi...@apache.org>.
ppalaga commented on a change in pull request #2841:
URL: https://github.com/apache/camel-quarkus/pull/2841#discussion_r657649298
##########
File path: integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
##########
@@ -54,24 +55,48 @@
// Create 2 sets of configuration to test scenarios:
// - Quarkus Infinispan client bean being autowired into the Camel Infinispan component
// - Component configuration where the Infinispan client is managed by Camel (E.g Infinispan client autowiring disabled)
- return CollectionHelper.mapOf(
- // quarkus
- "quarkus.infinispan-client.server-list", serverList,
- "quarkus.infinispan-client.near-cache-max-entries", "3",
- "quarkus.infinispan-client.auth-username", USER,
- "quarkus.infinispan-client.auth-password", PASS,
- "quarkus.infinispan-client.auth-realm", "default",
- "quarkus.infinispan-client.sasl-mechanism", "DIGEST-MD5",
- "quarkus.infinispan-client.auth-server-name", "infinispan",
- // camel
- "camel.component.infinispan.autowired-enabled", "false",
- "camel.component.infinispan.hosts", serverList,
- "camel.component.infinispan.username", USER,
- "camel.component.infinispan.password", PASS,
- "camel.component.infinispan.secure", "true",
- "camel.component.infinispan.security-realm", "default",
- "camel.component.infinispan.sasl-mechanism", "DIGEST-MD5",
- "camel.component.infinispan.security-server-name", "infinispan");
+ if (SystemUtils.IS_OS_LINUX) {
+ return CollectionHelper.mapOf(
+ // quarkus
+ "quarkus.infinispan-client.server-list", serverList,
+ "quarkus.infinispan-client.near-cache-max-entries", "3",
+ "quarkus.infinispan-client.auth-username", USER,
+ "quarkus.infinispan-client.auth-password", PASS,
+ "quarkus.infinispan-client.auth-realm", "default",
+ "quarkus.infinispan-client.sasl-mechanism", "DIGEST-MD5",
+ "quarkus.infinispan-client.auth-server-name", "infinispan",
+ // camel
+ "camel.component.infinispan.autowired-enabled", "false",
+ "camel.component.infinispan.hosts", serverList,
+ "camel.component.infinispan.username", USER,
+ "camel.component.infinispan.password", PASS,
+ "camel.component.infinispan.secure", "true",
+ "camel.component.infinispan.security-realm", "default",
+ "camel.component.infinispan.sasl-mechanism", "DIGEST-MD5",
+ "camel.component.infinispan.security-server-name",
+ "infinispan");
+ } else {
+ return CollectionHelper.mapOf(
+ // quarkus
+ "quarkus.infinispan-client.server-list", serverList,
+ "quarkus.infinispan-client.near-cache-max-entries", "3",
+ "quarkus.infinispan-client.auth-username", USER,
+ "quarkus.infinispan-client.auth-password", PASS,
+ "quarkus.infinispan-client.auth-realm", "default",
+ "quarkus.infinispan-client.sasl-mechanism", "DIGEST-MD5",
+ "quarkus.infinispan-client.auth-server-name", "infinispan",
+ "quarkus.infinispan-client.client-intelligence", "BASIC",
+ // camel
+ "camel.component.infinispan.autowired-enabled", "false",
+ "camel.component.infinispan.hosts", serverList,
+ "camel.component.infinispan.username", USER,
+ "camel.component.infinispan.password", PASS,
+ "camel.component.infinispan.secure", "true",
+ "camel.component.infinispan.security-realm", "default",
+ "camel.component.infinispan.sasl-mechanism", "DIGEST-MD5",
+ "camel.component.infinispan.security-server-name",
+ "infinispan");
+ }
Review comment:
Could we perhaps reduce the number of lines a bit? Maybe something like the following?
```suggestion
Map<String, String> result = CollectionHelper.mapOf(
// quarkus
"quarkus.infinispan-client.server-list", serverList,
"quarkus.infinispan-client.near-cache-max-entries", "3",
"quarkus.infinispan-client.auth-username", USER,
"quarkus.infinispan-client.auth-password", PASS,
"quarkus.infinispan-client.auth-realm", "default",
"quarkus.infinispan-client.sasl-mechanism", "DIGEST-MD5",
"quarkus.infinispan-client.auth-server-name", "infinispan",
// camel
"camel.component.infinispan.autowired-enabled", "false",
"camel.component.infinispan.hosts", serverList,
"camel.component.infinispan.username", USER,
"camel.component.infinispan.password", PASS,
"camel.component.infinispan.secure", "true",
"camel.component.infinispan.security-realm", "default",
"camel.component.infinispan.sasl-mechanism", "DIGEST-MD5",
"camel.component.infinispan.security-server-name",
"infinispan");
if (SystemUtils.IS_OS_MAC) {
/* Fix for https://github.com/apache/camel-quarkus/issues/2840 */
result.put("quarkus.infinispan-client.client-intelligence", "BASIC");
}
return result;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #2841: Fix InfinispanTest failed on Mac #2840
Posted by GitBox <gi...@apache.org>.
jamesnetherton merged pull request #2841:
URL: https://github.com/apache/camel-quarkus/pull/2841
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org