You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2019/01/29 12:16:10 UTC
james-project git commit: Revert "LOCAL ONLY max C* mem"
Repository: james-project
Updated Branches:
refs/heads/master 862f680fe -> d58b9769e
Revert "LOCAL ONLY max C* mem"
This reverts commit a8142407c8e738ed984e2ea8077a41e49220afe9.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d58b9769
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d58b9769
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d58b9769
Branch: refs/heads/master
Commit: d58b9769e524b7dfb160b7da67adc8715441db11
Parents: 862f680
Author: Matthieu Baechler <ma...@apache.org>
Authored: Tue Jan 29 13:15:51 2019 +0100
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Tue Jan 29 13:15:51 2019 +0100
----------------------------------------------------------------------
.../james/backends/cassandra/DockerCassandra.java | 17 +----------------
.../src/test/resources/logback-test.xml | 6 +++---
2 files changed, 4 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d58b9769/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java
----------------------------------------------------------------------
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 4739d51..f66d483 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
@@ -25,7 +25,6 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.DockerClientFactory;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.OutputFrame;
-import org.testcontainers.images.builder.ImageFromDockerfile;
import com.github.dockerjava.api.DockerClient;
import com.google.common.collect.ImmutableMap;
@@ -36,27 +35,13 @@ public class DockerCassandra {
private static final int CASSANDRA_PORT = 9042;
- private static final String CASSANDRA_CONFIG_DIR = "$CASSANDRA_CONFIG";
- private static final String JVM_OPTIONS = CASSANDRA_CONFIG_DIR + "/jvm.options";
-
private final GenericContainer<?> cassandraContainer;
private final DockerClient client;
@SuppressWarnings("resource")
public DockerCassandra() {
client = DockerClientFactory.instance().client();
- boolean deleteOnExit = false;
- int cassandraMemory = 650;
- long cassandraContainerMemory = Float.valueOf(cassandraMemory * 1.5f * 1024 * 1024L).longValue();
- cassandraContainer = new GenericContainer<>(
- new ImageFromDockerfile("cassandra_3_11_3", deleteOnExit)
- .withDockerfileFromBuilder(builder ->
- builder
- .from("cassandra:3.11.3")
- .env("ENV CASSANDRA_CONFIG", "/etc/cassandra")
- .run("echo \"-Xms" + cassandraMemory + "M\" >> " + JVM_OPTIONS)
- .run("echo \"-Xmx" + cassandraMemory + "M\" >> " + JVM_OPTIONS)
- .build()))
+ cassandraContainer = new GenericContainer<>("cassandra:3.11.3")
.withCreateContainerCmdModifier(cmd -> cmd.getHostConfig().withTmpFs(ImmutableMap.of("/var/lib/cassandra", "rw,noexec,nosuid,size=200m")))
.withExposedPorts(CASSANDRA_PORT)
.withLogConsumer(DockerCassandra::displayDockerLog);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d58b9769/server/data/data-jmap-cassandra/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jmap-cassandra/src/test/resources/logback-test.xml b/server/data/data-jmap-cassandra/src/test/resources/logback-test.xml
index dbdaa3c..fe43bd9 100644
--- a/server/data/data-jmap-cassandra/src/test/resources/logback-test.xml
+++ b/server/data/data-jmap-cassandra/src/test/resources/logback-test.xml
@@ -16,13 +16,13 @@
<appender-ref ref="CONSOLE" />
</root>
- <logger name="com.github.dockerjava" level="OFF"/>
<logger name="org.apache.james" level="WARN" >
<appender-ref ref="CONSOLE" />
</logger>
- <logger name="cassandra_3_11_3" level="DEBUG" />
+ <logger name="org.apache.james.backends.cassandra.DockerCassandraRule" level="DEBUG" >
+ <appender-ref ref="CONSOLE" />
+ </logger>
- <logger name="org.apache.james.backends.cassandra.DockerCassandraRule" level="DEBUG" />
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org