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 ro...@apache.org on 2019/06/21 13:17:31 UTC
[james-project] branch master updated (51da802 -> 2d64181)
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 51da802 JAMES-2797 Remove ThreadLocalRandom binding in RabbitMQModule
new 086efa6 JAMES-2771 Launch stress test jobs with provisioned instance
new fd613c3 JAMES-2767 prevent import of commons-logging to make log go through slf4j
new 2d64181 Merge remote-tracking branch 'mbaechler/fix-es-logging'
The 3 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:
JenkinsfileStressTests.groovy | 94 ++++++++++++++++++++++
backends-common/elasticsearch/pom.xml | 6 ++
.../destination/conf/cassandra.properties | 2 +-
.../destination/conf/cassandra.properties | 2 +-
.../destination/conf/cassandra.properties | 2 +-
.../destination/conf/cassandra.properties | 2 +-
6 files changed, 104 insertions(+), 4 deletions(-)
create mode 100644 JenkinsfileStressTests.groovy
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 03/03: Merge remote-tracking branch
'mbaechler/fix-es-logging'
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 2d641813573ce0495ef582df04f97582507cc476
Merge: 086efa6 fd613c3
Author: Raphael Ouazana <ra...@linagora.com>
AuthorDate: Fri Jun 21 15:16:23 2019 +0200
Merge remote-tracking branch 'mbaechler/fix-es-logging'
backends-common/elasticsearch/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 02/03: JAMES-2771 Launch stress test jobs with
provisioned instance
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 086efa6553b31f2f217b44a82b903ca8afebeda5
Author: Gautier DI FOLCO <gd...@linagora.com>
AuthorDate: Tue May 28 14:25:36 2019 +0200
JAMES-2771 Launch stress test jobs with provisioned instance
---
JenkinsfileStressTests.groovy | 94 ++++++++++++++++++++++
.../destination/conf/cassandra.properties | 2 +-
.../destination/conf/cassandra.properties | 2 +-
.../destination/conf/cassandra.properties | 2 +-
.../destination/conf/cassandra.properties | 2 +-
5 files changed, 98 insertions(+), 4 deletions(-)
diff --git a/JenkinsfileStressTests.groovy b/JenkinsfileStressTests.groovy
new file mode 100644
index 0000000..da2d5a4
--- /dev/null
+++ b/JenkinsfileStressTests.groovy
@@ -0,0 +1,94 @@
+// This file should respect the Jenkinsfile format describe here:
+// https://jenkins.io/doc/book/pipeline/jenkinsfile/
+//
+// It may be used by any Jenkins instance you own.
+//
+// In order to work properly, it requires the following parameters:
+// - SCENARIO: the Gatling scenario you want to play (ex. com.linagora.gatling.imap.scenario.ImapSimpleScenario)
+
+// Method in order to retry a command.
+// It may be used to wait for a service to be available.
+
+pipeline {
+ agent none
+
+ stages {
+ stage('Prepare target') {
+ agent {
+ node {
+ label 'target'
+ }
+ }
+
+ tools {
+ maven 'maven'
+ }
+
+ stages {
+ stage('Compile') {
+ steps {
+ sh "mvn clean install -T1C -DskipTests"
+ }
+ }
+ stage('Build image') {
+ steps {
+ script {
+ sh "cp server/container/guice/cassandra-rabbitmq-guice/target/james-server-cassandra-rabbitmq-guice.jar dockerfiles/run/guice/cassandra-rabbitmq/destination"
+ sh "cp -r server/container/guice/cassandra-rabbitmq-guice/target/james-server-cassandra-rabbitmq-guice.lib dockerfiles/run/guice/cassandra-rabbitmq/destination"
+ sh "cp server/container/cli/target/james-server-cli.jar dockerfiles/run/guice/cassandra-rabbitmq/destination"
+ sh "cp -r server/container/cli/target/james-server-cli.lib dockerfiles/run/guice/cassandra-rabbitmq/destination"
+ sh 'cp server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/resources/keystore dockerfiles/run/guice/cassandra-rabbitmq/destination/conf'
+ sh 'docker build -t james_run dockerfiles/run/guice/cassandra-rabbitmq'
+ }
+ }
+ }
+ stage('Start James') {
+ steps {
+ script {
+ sh "cd /srv && sudo btrfs subvolume snapshot bench-snapshot bench-running-docker"
+ sh 'docker run -d --name=cassandra -p 9042:9042 -v /srv/bench-running-docker/cassandra:/var/lib/cassandra cassandra:3.11.3'
+ sh 'docker run -d --name=elasticsearch -p 9200:9200 -v /srv/bench-running-docker/elasticsearch:/usr/share/elasticsearch/data/elasticsearch --env "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:6.3.2'
+ sh 'docker run -d --name=tika logicalspark/docker-tikaserver:1.19.1'
+ sh 'docker run -d --name=swift -p 8080:8080 -v /srv/bench-running-docker/swift:/srv/1/node/sdb1 jeantil/openstack-keystone-swift:pike'
+ sh 'docker run -d --name=rabbitmq -p 15672:15672 -p 5672:5672 rabbitmq:3.7.7-management'
+
+ sh 'docker run -d --hostname HOSTNAME -p 25:25 -p 8000:8000 -p 110:110 -p 143:143 -p 465:465 -p 587:587 -p 993:993 --link cassandra:cassandra --link rabbitmq:rabbitmq --link elasticsearch:elasticsearch --link tika:tika --link swift:swift --name james_run -t james_run'
+ timeout(time: 20, unit: 'MINUTES') {
+ retry(200) {
+ sleep 5
+ def jamesCliWithOptions = 'java -jar /root/james-cli.jar -h 127.0.0.1 -p 9999'
+ sh "docker exec james_run ${jamesCliWithOptions} listusers"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ stage('Start injector') {
+ agent {
+ node {
+ label 'injector'
+ }
+ }
+ stages {
+ stage('Run Gatling test') {
+ steps {
+ build job: 'Gatling-job', parameters: [[$class: 'StringParameterValue', name: 'SBT_ACTION', value: "gatling:testOnly ${params.SIMULATION}"], [$class: 'StringParameterValue', name: 'GITHUB', value: params.GITHUB_SIMULATIONS]]
+ }
+ }
+ }
+ }
+ }
+
+ post {
+ always {
+ node('target') {
+ script {
+ sh 'docker rm -f cassandra rabbitmq elasticsearch tika swift james_run || true'
+ sh 'sudo btrfs subvolume delete /srv/bench-running-docker'
+ }
+ }
+ }
+ }
+}
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/cassandra.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/cassandra.properties
index a2ec35e..026f698 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/cassandra.properties
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/cassandra.properties
@@ -2,7 +2,7 @@
cassandra.nodes=cassandra
cassandra.keyspace=apache_james
cassandra.replication.factor=1
-cassandra.retryConnection.maxRetries=10
+cassandra.retryConnection.maxRetries=200
cassandra.retryConnection.minDelay=5000
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/cassandra.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/cassandra.properties
index a3f91b7..69aaadf 100644
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/cassandra.properties
+++ b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/cassandra.properties
@@ -2,7 +2,7 @@
cassandra.nodes=cassandra
cassandra.keyspace=apache_james
cassandra.replication.factor=1
-cassandra.retryConnection.maxRetries=10
+cassandra.retryConnection.maxRetries=200
cassandra.retryConnection.minDelay=5000
# Read com.datastax.driver.core.PoolingOptions for knowing defaults value
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/cassandra.properties b/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/cassandra.properties
index a3f91b7..69aaadf 100644
--- a/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/cassandra.properties
+++ b/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/cassandra.properties
@@ -2,7 +2,7 @@
cassandra.nodes=cassandra
cassandra.keyspace=apache_james
cassandra.replication.factor=1
-cassandra.retryConnection.maxRetries=10
+cassandra.retryConnection.maxRetries=200
cassandra.retryConnection.minDelay=5000
# Read com.datastax.driver.core.PoolingOptions for knowing defaults value
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties b/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties
index a3f91b7..69aaadf 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties
+++ b/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties
@@ -2,7 +2,7 @@
cassandra.nodes=cassandra
cassandra.keyspace=apache_james
cassandra.replication.factor=1
-cassandra.retryConnection.maxRetries=10
+cassandra.retryConnection.maxRetries=200
cassandra.retryConnection.minDelay=5000
# Read com.datastax.driver.core.PoolingOptions for knowing defaults value
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 01/03: JAMES-2767 prevent import of commons-logging
to make log go through slf4j
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit fd613c32fb622388469dcc06335be0a1c074f5bd
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Wed Jun 19 15:13:50 2019 +0200
JAMES-2767 prevent import of commons-logging to make log go through slf4j
---
backends-common/elasticsearch/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml
index 7f92990..20122f6 100644
--- a/backends-common/elasticsearch/pom.xml
+++ b/backends-common/elasticsearch/pom.xml
@@ -83,6 +83,12 @@
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<version>6.3.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org