You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2021/06/03 07:16:08 UTC
[james-project] branch master updated (b9387df -> 9f7425e)
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from b9387df JAMES-3187 Remove duplicated SNAPSHOT mention in documentation menu
new d707b3d [REFACTORING] Fix limit on cassandra docker image memory heap space
new 9f7425e [REFACTORING] Add a memory hepa size limit on ES docker container
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/james/backends/cassandra/DockerCassandra.java | 4 ++--
.../java/org/apache/james/backends/es/v7/DockerElasticSearch.java | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 02/02: [REFACTORING] Add a memory hepa size limit
on ES docker container
Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 9f7425e531ac86ff07a05bec471a9b808d1c640d
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Tue Jun 1 10:57:52 2021 +0700
[REFACTORING] Add a memory hepa size limit on ES docker container
The default is 1Go. I'm betting on half here (512M).
---
.../test/java/org/apache/james/backends/es/v7/DockerElasticSearch.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/backends-common/elasticsearch-v7/src/test/java/org/apache/james/backends/es/v7/DockerElasticSearch.java b/backends-common/elasticsearch-v7/src/test/java/org/apache/james/backends/es/v7/DockerElasticSearch.java
index 15f5732..5ece588 100644
--- a/backends-common/elasticsearch-v7/src/test/java/org/apache/james/backends/es/v7/DockerElasticSearch.java
+++ b/backends-common/elasticsearch-v7/src/test/java/org/apache/james/backends/es/v7/DockerElasticSearch.java
@@ -20,6 +20,7 @@
package org.apache.james.backends.es.v7;
import static org.apache.james.backends.es.v7.DockerElasticSearch.Fixture.ES_HTTP_PORT;
+import static org.apache.james.backends.es.v7.DockerElasticSearch.Fixture.ES_MEMORY;
import java.net.MalformedURLException;
import java.net.URL;
@@ -124,6 +125,7 @@ public interface DockerElasticSearch {
interface Fixture {
int ES_HTTP_PORT = 9200;
+ int ES_MEMORY = 620;
}
class NoAuth implements DockerElasticSearch {
@@ -133,6 +135,7 @@ public interface DockerElasticSearch {
.withTmpFs(ImmutableMap.of("/usr/share/elasticsearch/data", "rw,size=200m"))
.withExposedPorts(ES_HTTP_PORT)
.withEnv("discovery.type", "single-node")
+ .withEnv("ES_JAVA_OPTS", "-Xms" + ES_MEMORY + "m -Xmx" + ES_MEMORY + "m")
.withAffinityToContainer()
.waitingFor(new HostPortWaitStrategy().withRateLimiter(RateLimiters.TWENTIES_PER_SECOND));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 01/02: [REFACTORING] Fix limit on cassandra docker
image memory heap space
Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit d707b3d2d1c0e05a2043735dc75e9190123b5304
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Tue Jun 1 10:56:37 2021 +0700
[REFACTORING] Fix limit on cassandra docker image memory heap space
It was not working, as in testcontainers we know we define an ENV variable by using the `env()` method, so declaring "ENV" in the key is a mistake. It's been a long time this is intended to run as 650M heap memory size for Cassandra, while in fact it's been the default 4Go running meanwhile.
---
.../java/org/apache/james/backends/cassandra/DockerCassandra.java | 4 ++--
1 file changed, 2 insertions(+), 2 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 f32dc58..091e9ba 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
@@ -129,7 +129,7 @@ public class DockerCassandra {
}
private static final int CASSANDRA_PORT = 9042;
- private static final int CASSANDRA_MEMORY = 650;
+ private static final int CASSANDRA_MEMORY = 750;
private static final String CASSANDRA_CONFIG_DIR = "$CASSANDRA_CONFIG";
private static final String JVM_OPTIONS = CASSANDRA_CONFIG_DIR + "/jvm.options";
@@ -175,7 +175,7 @@ public class DockerCassandra {
.withDockerfileFromBuilder(builder ->
additionalSteps.applyStep(builder
.from("cassandra:3.11.10")
- .env("ENV CASSANDRA_CONFIG", "/etc/cassandra")
+ .env("CASSANDRA_CONFIG", "/etc/cassandra")
.run("echo \"-Xms" + CASSANDRA_MEMORY + "M\" >> " + JVM_OPTIONS)
.run("echo \"-Xmx" + CASSANDRA_MEMORY + "M\" >> " + JVM_OPTIONS)
.run("sed", "-i", "s/auto_snapshot: true/auto_snapshot: false/g", "/etc/cassandra/cassandra.yaml")
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org