Skip to content

Commit

Permalink
Use first and second container as seeds (#609)
Browse files Browse the repository at this point in the history
Hopefully this will improve stability of the docker containers used for tests.
  • Loading branch information
masokol authored Oct 20, 2023
1 parent 7f3c7a4 commit c06fbf9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ecchronos-binary/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
</arguments>
<workingDirectory>${project.build.directory}/test</workingDirectory>
<environmentVariables>
<CASSANDRA_IP>${docker.container.seed.ip}</CASSANDRA_IP>
<CASSANDRA_IP>${docker.container.seed1.ip}</CASSANDRA_IP>
<CASSANDRA_JMX_PORT>7199</CASSANDRA_JMX_PORT>
<CASSANDRA_NATIVE_PORT>9042</CASSANDRA_NATIVE_PORT>
</environmentVariables>
Expand Down
11 changes: 6 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ limitations under the License.
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<it-cassandra.ip>${docker.container.seed.ip}</it-cassandra.ip>
<it-cassandra.ip>${docker.container.seed1.ip}</it-cassandra.ip>
<it-cassandra.jmx.port>7199</it-cassandra.jmx.port>
<it-cassandra.native.port>9042</it-cassandra.native.port>
</systemPropertyVariables>
Expand Down Expand Up @@ -931,7 +931,7 @@ limitations under the License.
<JVM_OPTS>-Xmx${it.cassandra.heap} -Xms${it.cassandra.heap}</JVM_OPTS>
<JVM_EXTRA_OPTS>-Dcom.sun.management.jmxremote.authenticate=false -Dcassandra.superuser_setup_delay_ms=0 -Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.ring_delay_ms=0</JVM_EXTRA_OPTS>
</env>
<exposedPropertyKey>seed</exposedPropertyKey>
<exposedPropertyKey>seed1</exposedPropertyKey>
<volumes>
<bind>
<volume>${project.build.directory}/certificates/cert:/etc/certificates</volume>
Expand Down Expand Up @@ -959,10 +959,11 @@ limitations under the License.
<env>
<LOCAL_JMX>no</LOCAL_JMX>
<HOSTNAME>$HOSTNAME</HOSTNAME>
<CASSANDRA_SEEDS>$${docker.container.seed.ip}</CASSANDRA_SEEDS>
<CASSANDRA_SEEDS>$${docker.container.seed1.ip}</CASSANDRA_SEEDS>
<JVM_OPTS>-Xmx${it.cassandra.heap} -Xms${it.cassandra.heap}</JVM_OPTS>
<JVM_EXTRA_OPTS>-Dcom.sun.management.jmxremote.authenticate=false -Dcassandra.superuser_setup_delay_ms=0 -Dcassandra.gossip_settle_min_wait_ms=100 -Dcassandra.gossip_settle_interval_ms=100 -Dcassandra.ring_delay_ms=4000</JVM_EXTRA_OPTS>
</env>
<exposedPropertyKey>seed2</exposedPropertyKey>
<volumes>
<bind>
<volume>${project.build.directory}/certificates/cert:/etc/certificates</volume>
Expand All @@ -989,7 +990,7 @@ limitations under the License.
<memorySwap>-1</memorySwap>
<env>
<LOCAL_JMX>no</LOCAL_JMX>
<CASSANDRA_SEEDS>$${docker.container.seed.ip}</CASSANDRA_SEEDS>
<CASSANDRA_SEEDS>$${docker.container.seed1.ip},$${docker.container.seed2.ip}</CASSANDRA_SEEDS>
<JVM_OPTS>-Xmx${it.cassandra.heap} -Xms${it.cassandra.heap}</JVM_OPTS>
<JVM_EXTRA_OPTS>-Dcom.sun.management.jmxremote.authenticate=false -Dcassandra.superuser_setup_delay_ms=0 -Dcassandra.gossip_settle_min_wait_ms=100 -Dcassandra.gossip_settle_interval_ms=100 -Dcassandra.ring_delay_ms=4000</JVM_EXTRA_OPTS>
</env>
Expand Down Expand Up @@ -1019,7 +1020,7 @@ limitations under the License.
<memorySwap>-1</memorySwap>
<env>
<LOCAL_JMX>no</LOCAL_JMX>
<CASSANDRA_SEEDS>$${docker.container.seed.ip}</CASSANDRA_SEEDS>
<CASSANDRA_SEEDS>$${docker.container.seed1.ip},$${docker.container.seed2.ip}</CASSANDRA_SEEDS>
<JVM_OPTS>-Xmx${it.cassandra.heap} -Xms${it.cassandra.heap}</JVM_OPTS>
<JVM_EXTRA_OPTS>-Dcom.sun.management.jmxremote.authenticate=false -Dcassandra.superuser_setup_delay_ms=0 -Dcassandra.gossip_settle_min_wait_ms=100 -Dcassandra.gossip_settle_interval_ms=100 -Dcassandra.ring_delay_ms=4000</JVM_EXTRA_OPTS>
</env>
Expand Down

0 comments on commit c06fbf9

Please sign in to comment.