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

[9.4] ISPN-9748 Default transport for the test suite should be the same #6443

Closed
wants to merge 1 commit into from
Closed

[9.4] ISPN-9748 Default transport for the test suite should be the same #6443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java
View file
Open in desktop
Expand Up @@ -74,7 +74,7 @@ protected Integer initialValue() {
};

static {
JGROUPS_STACK = LegacyKeySupportSystemProperties.getProperty("infinispan.test.jgroups.protocol", "protocol.stack", "tcp");
JGROUPS_STACK = LegacyKeySupportSystemProperties.getProperty("infinispan.test.jgroups.protocol", "protocol.stack", "udp");
Copy link
Member

Choose a reason for hiding this comment

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

I'm a bit concerned about changing the default to udp because we've had problems with multicasting on Macs before, but I guess it's already the default in the server so it must be working now.

Also, I'm thinking about changing the name to infinispan.test.jgroups.stack, using infinispan.test.jgroups.protocol as fallback in library tests and default.transport.stack as fallback in server tests. protocol always seemed a bit weird here, but I do want to keep infinispan.test as part of the property name :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

multicasting on Macs

Multicasting on Macs is still an issue for Embedded and Server mode. If you are using UDP without -Djava.net.preferIPv4Stack=true the cluster won't form.
The Jgroups issue is https://issues.jboss.org/browse/JGRP-2305 and it was fixed in 4.0.16. ISPN is using 4.0.15.Final and Jgroups 4.0.16 was not released yet. I prefer cut a release for Jgroups, update the Jgroups version for ISPN and then merge that PR. What do you think?

Properties

Do you mean getProperty("infinispan.test.jgroups.stack", "default.transport.stack", "udp") ?

System.out.println("Transport protocol stack used = " + JGROUPS_STACK);
}

Expand Down
1 change: 0 additions & 1 deletion integrationtests/osgi/pom.xml
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@
<defaultTestGroup />
<defaultExcludedTestGroup />
<infinispan.test.parallel.threads>1</infinispan.test.parallel.threads>
<infinispan.test.jgroups.protocol>tcp</infinispan.test.jgroups.protocol>
<forkJvmArgs>-Xmx500m -XX:HeapDumpPath=${user.dir}</forkJvmArgs>
<target.tmp.dir>${project.build.directory}/tmp/</target.tmp.dir>
<skipOSGiTests>${skipTests}</skipOSGiTests>
Expand Down
3 changes: 1 addition & 2 deletions integrationtests/wildfly-modules/pom.xml
View file
Open in desktop
Expand Up @@ -21,8 +21,7 @@
<resources.dir>${basedir}/src/test/resources</resources.dir>
<serverMemoryJvmArgs>-Xmx300m ${testjvm.commonArgs}</serverMemoryJvmArgs>
<jvm.x64.args />
<default.transport.stack>udp</default.transport.stack>
<transport.stack>-Djboss.default.jgroups.stack=${default.transport.stack}</transport.stack>
<transport.stack>-Djboss.default.jgroups.stack=${infinispan.test.jgroups.protocol}</transport.stack>
<jvm.ip.stack>-Djava.net.preferIPv4Stack=true</jvm.ip.stack>
<mcast.ip>234.99.54.14</mcast.ip>
<jvm.ip.stack>-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false -Djboss.default.multicast.address=${mcast.ip}</jvm.ip.stack>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -178,7 +178,8 @@
<forkJvmArgs>-Xmx1G ${testjvm.commonArgs}</forkJvmArgs>
<infinispan.module-suffix>-${project.artifactId}</infinispan.module-suffix>
<ansi.strip/>
<infinispan.test.jgroups.protocol>tcp</infinispan.test.jgroups.protocol>
<default.transport.stack>udp</default.transport.stack>
<infinispan.test.jgroups.protocol>${default.transport.stack}</infinispan.test.jgroups.protocol>
<infinispan.test.parallel.threads>8</infinispan.test.parallel.threads>
<skipArtifactUpload>false</skipArtifactUpload>
<upload.username>infinispan</upload.username>
Expand Down
4 changes: 2 additions & 2 deletions server/integration/testsuite/README.txt
View file
Open in desktop
Expand Up @@ -64,8 +64,8 @@ This is controlled by following profile

Running client tests with TCP stack (UDP by default)
----------------------------------------------------
Controlled by property default.transport.stack:
mvn clean verify -Psuite.client -Ddefault.transport.stack=tcp
Controlled by property infinispan.test.jgroups.protocol:
mvn clean verify -Psuite.client -Dinfinispan.test.jgroups.protocol=tcp

Client side logging
-------------------
Expand Down
19 changes: 9 additions & 10 deletions server/integration/testsuite/pom.xml
View file
Open in desktop
Expand Up @@ -301,8 +301,7 @@

<serverMemoryJvmArgs>-Xmx300m ${testjvm.commonArgs}</serverMemoryJvmArgs>
<jvm.x64.args />
<default.transport.stack>udp</default.transport.stack>
<transport.stack>-Djboss.default.jgroups.stack=${default.transport.stack}</transport.stack>
<transport.stack>-Djboss.default.jgroups.stack=${infinispan.test.jgroups.protocol}</transport.stack>

<jvm.ip.stack>-Djava.net.preferIPv4Stack=true</jvm.ip.stack>
<node0.ip>127.0.0.1</node0.ip>
Expand Down Expand Up @@ -913,7 +912,7 @@
<goal>integration-test</goal>
</goals>
<configuration>
<reportNameSuffix>localmode-${default.transport.stack}</reportNameSuffix>
<reportNameSuffix>localmode-${infinispan.test.jgroups.protocol}</reportNameSuffix>
<groups>${groups.client.local}</groups>
<excludedGroups>${groups.unstable}</excludedGroups>
<systemPropertyVariables>
Expand All @@ -930,7 +929,7 @@
<goal>integration-test</goal>
</goals>
<configuration>
<reportNameSuffix>localmode-${default.transport.stack}</reportNameSuffix>
<reportNameSuffix>localmode-${infinispan.test.jgroups.protocol}</reportNameSuffix>
<groups>org.infinispan.server.test.category.MemcachedSingleNode</groups>
<excludedGroups>${groups.unstable}</excludedGroups>
<systemPropertyVariables>
Expand All @@ -947,7 +946,7 @@
<goal>integration-test</goal>
</goals>
<configuration>
<reportNameSuffix>localmode-${default.transport.stack}</reportNameSuffix>
<reportNameSuffix>localmode-${infinispan.test.jgroups.protocol}</reportNameSuffix>
<groups>${groups.client.local.domain}</groups>
<excludedGroups>${groups.unstable}</excludedGroups>
<systemPropertyVariables>
Expand All @@ -964,7 +963,7 @@
<goal>integration-test</goal>
</goals>
<configuration>
<reportNameSuffix>distmode-${default.transport.stack}</reportNameSuffix>
<reportNameSuffix>distmode-${infinispan.test.jgroups.protocol}</reportNameSuffix>
<groups>${groups.client.clustered}</groups>
<excludedGroups>${groups.unstable}</excludedGroups>
<systemPropertyVariables>
Expand All @@ -981,7 +980,7 @@
<goal>integration-test</goal>
</goals>
<configuration>
<reportNameSuffix>distmode-${default.transport.stack}</reportNameSuffix>
<reportNameSuffix>distmode-${infinispan.test.jgroups.protocol}</reportNameSuffix>
<groups>org.infinispan.server.test.category.MemcachedClustered</groups>
<excludedGroups>${groups.unstable}</excludedGroups>
<systemPropertyVariables>
Expand All @@ -998,7 +997,7 @@
<goal>integration-test</goal>
</goals>
<configuration>
<reportNameSuffix>distmode-${default.transport.stack}</reportNameSuffix>
<reportNameSuffix>distmode-${infinispan.test.jgroups.protocol}</reportNameSuffix>
<groups>${groups.client.clustered.domain}</groups>
<excludedGroups>${groups.unstable}</excludedGroups>
<systemPropertyVariables>
Expand All @@ -1015,7 +1014,7 @@
<goal>integration-test</goal>
</goals>
<configuration>
<reportNameSuffix>replmode-${default.transport.stack}</reportNameSuffix>
<reportNameSuffix>replmode-${infinispan.test.jgroups.protocol}</reportNameSuffix>
<groups>${groups.client.clustered}</groups>
<excludedGroups>${groups.unstable}</excludedGroups>
<systemPropertyVariables>
Expand All @@ -1032,7 +1031,7 @@
<goal>integration-test</goal>
</goals>
<configuration>
<reportNameSuffix>replmode-${default.transport.stack}</reportNameSuffix>
<reportNameSuffix>replmode-${infinispan.test.jgroups.protocol}</reportNameSuffix>
<groups>${groups.client.clustered.domain}</groups>
<excludedGroups>${groups.unstable}</excludedGroups>
<systemPropertyVariables>
Expand Down