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 8c3df5cc712e34df3614df7c84378582ee905c61 Author: Tung Tran <[email protected]> AuthorDate: Mon Aug 21 10:07:31 2023 +0700 [BUILD] Setting Cassandra memory based on CI environment or not --- .../apache/james/backends/cassandra/DockerCassandra.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 cc7a74210d..aadf259917 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 @@ -169,20 +169,26 @@ public class DockerCassandra { public void close() { } }); + + String memorySettingCommand = Optional.ofNullable(System.getenv("CI")) + .map(Boolean::parseBoolean) + .filter(Boolean.TRUE::equals) + .map(ci -> "echo \"\" ") + .orElse("echo \"-Xms" + CASSANDRA_MEMORY + "M\" >> " + JVM_OPTIONS + + "&& echo \"-Xmx" + CASSANDRA_MEMORY + "M\" >> " + JVM_OPTIONS); + cassandraContainer = new GenericContainer<>( new ImageFromDockerfile(imageName,deleteImageAfterUsage) .withDockerfileFromBuilder(builder -> additionalSteps.applyStep(builder .from("cassandra:4.1.3") .env("CASSANDRA_CONFIG", "/etc/cassandra") - .run("echo \"-Xms" + CASSANDRA_MEMORY + "M\" >> " + JVM_OPTIONS - + "&& echo \"-Xmx" + CASSANDRA_MEMORY + "M\" >> " + JVM_OPTIONS + .run(memorySettingCommand + "&& echo \"-Dcassandra.skip_wait_for_gossip_to_settle=0\" >> " + JVM_OPTIONS + "&& echo \"-Dcassandra.load_ring_state=false\" >> " + JVM_OPTIONS + "&& echo \"-Dcassandra.initial_token=1 \" >> " + JVM_OPTIONS - + "&& echo \"-Dcassandra.num_tokens=nil \" >> " + JVM_OPTIONS - + "&& echo \"-Dcassandra.allocate_tokens_for_local_replication_factor=nil \" >> " + JVM_OPTIONS + "&& sed -i 's/auto_snapshot: true/auto_snapshot: false/g' /etc/cassandra/cassandra.yaml" + + "&& sed -i 's/allocate_tokens_for_local_replication_factor: 3/allocate_tokens_for_local_replication_factor: 0/g' /etc/cassandra/cassandra.yaml" + "&& echo 'authenticator: PasswordAuthenticator' >> /etc/cassandra/cassandra.yaml" + "&& echo 'authorizer: org.apache.cassandra.auth.CassandraAuthorizer' >> /etc/cassandra/cassandra.yaml")) .build())) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
