This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 52be0e4ae46e115e66786bacd4e11ec8a081cb66 Author: Tung Tran <[email protected]> AuthorDate: Fri Aug 18 08:56:32 2023 +0700 Fix jvm-*.options when upgrade Docker Cassandra 3 -> 4 Ref: https://cassandra.apache.org/doc/latest/cassandra/configuration/cass_jvm_options_file.html --- .../test/java/org/apache/james/backends/cassandra/DockerCassandra.java | 2 +- server/apps/cassandra-app/docker-compose.yml | 2 ++ server/apps/distributed-app/docker-compose.yml | 2 ++ server/apps/distributed-pop3-app/docker-compose.yml | 2 ++ third-party/clamav/docker-compose.yml | 2 ++ third-party/rspamd/docker-compose-distributed.yml | 2 ++ 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java index 8c1b69b4e0..7d5e2d4920 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java @@ -126,7 +126,7 @@ public class DockerCassandra { private static final int CASSANDRA_MEMORY = 1024; private static final String CASSANDRA_CONFIG_DIR = "$CASSANDRA_CONFIG"; - private static final String JVM_OPTIONS = CASSANDRA_CONFIG_DIR + "/jvm.options"; + private static final String JVM_OPTIONS = CASSANDRA_CONFIG_DIR + "/jvm-server.options"; private final GenericContainer<?> cassandraContainer; private final DockerClient client; diff --git a/server/apps/cassandra-app/docker-compose.yml b/server/apps/cassandra-app/docker-compose.yml index f415df0641..5821b34c48 100644 --- a/server/apps/cassandra-app/docker-compose.yml +++ b/server/apps/cassandra-app/docker-compose.yml @@ -47,6 +47,8 @@ services: interval: 3s timeout: 20s retries: 5 + environment: + - JVM_OPTS=-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=1 networks: - james diff --git a/server/apps/distributed-app/docker-compose.yml b/server/apps/distributed-app/docker-compose.yml index 2a08c60040..5ad5c55ed4 100644 --- a/server/apps/distributed-app/docker-compose.yml +++ b/server/apps/distributed-app/docker-compose.yml @@ -51,6 +51,8 @@ services: interval: 3s timeout: 20s retries: 5 + environment: + - JVM_OPTS=-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=1 networks: - james diff --git a/server/apps/distributed-pop3-app/docker-compose.yml b/server/apps/distributed-pop3-app/docker-compose.yml index 0ecff28630..71d2715e43 100644 --- a/server/apps/distributed-pop3-app/docker-compose.yml +++ b/server/apps/distributed-pop3-app/docker-compose.yml @@ -51,6 +51,8 @@ services: interval: 3s timeout: 20s retries: 5 + environment: + - JVM_OPTS=-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=1 networks: - james diff --git a/third-party/clamav/docker-compose.yml b/third-party/clamav/docker-compose.yml index 2fb8d44e6f..663d2c8328 100644 --- a/third-party/clamav/docker-compose.yml +++ b/third-party/clamav/docker-compose.yml @@ -56,6 +56,8 @@ services: interval: 3s timeout: 20s retries: 5 + environment: + - JVM_OPTS=-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=1 networks: - james diff --git a/third-party/rspamd/docker-compose-distributed.yml b/third-party/rspamd/docker-compose-distributed.yml index bd6c841161..3c04c5510d 100644 --- a/third-party/rspamd/docker-compose-distributed.yml +++ b/third-party/rspamd/docker-compose-distributed.yml @@ -61,6 +61,8 @@ services: interval: 3s timeout: 20s retries: 5 + environment: + - JVM_OPTS=-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=1 networks: - james --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
