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 ad...@apache.org on 2018/12/07 16:13:11 UTC
[03/11] james-project git commit: JAMES-2590 Change default shards &
replica ES configuration values should match the recommended values from ES
documentation
https://www.elastic.co/guide/en/elasticsearch/guide/current/_index_settings.html
JAMES-2590 Change default shards & replica ES configuration values
should match the recommended values from ES documentation
https://www.elastic.co/guide/en/elasticsearch/guide/current/_index_settings.html
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/163db061
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/163db061
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/163db061
Branch: refs/heads/3.2.x
Commit: 163db061212d67a30bc7bda18276343fd110f0b0
Parents: 1d6aae0
Author: Antoine Duprat <ad...@linagora.com>
Authored: Mon Nov 12 21:51:48 2018 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 7 17:11:56 2018 +0100
----------------------------------------------------------------------
.../backends/es/ElasticSearchConfiguration.java | 4 ++--
.../james/templates/elasticsearch.properties | 4 ++--
.../destination/conf/elasticsearch.properties | 6 +++---
.../destination/conf/elasticsearch.properties | 6 +++---
.../search/LuceneMessageSearchIndexTest.java | 8 ++++----
.../search/AbstractMessageSearchIndexTest.java | 20 ++++++++++----------
6 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/163db061/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchConfiguration.java
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchConfiguration.java b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchConfiguration.java
index b97d9d7..abe23c8 100644
--- a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchConfiguration.java
+++ b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchConfiguration.java
@@ -203,8 +203,8 @@ public class ElasticSearchConfiguration {
public static final int DEFAULT_CONNECTION_MAX_RETRIES = 7;
public static final int DEFAULT_CONNECTION_MIN_DELAY = 3000;
public static final boolean DEFAULT_INDEX_ATTACHMENTS = true;
- public static final int DEFAULT_NB_SHARDS = 1;
- public static final int DEFAULT_NB_REPLICA = 0;
+ public static final int DEFAULT_NB_SHARDS = 5;
+ public static final int DEFAULT_NB_REPLICA = 1;
public static final int DEFAULT_PORT = 9300;
private static final String LOCALHOST = "127.0.0.1";
public static final Optional<Integer> DEFAULT_PORT_AS_OPTIONAL = Optional.of(DEFAULT_PORT);
http://git-wip-us.apache.org/repos/asf/james-project/blob/163db061/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/elasticsearch.properties
----------------------------------------------------------------------
diff --git a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/elasticsearch.properties b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/elasticsearch.properties
index cf1daac..cba4615 100644
--- a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/elasticsearch.properties
+++ b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/elasticsearch.properties
@@ -26,8 +26,8 @@ elasticsearch.port=9300
# You can alternatively provide a list of hosts following this format :
# elasticsearch.hosts=host1:9300,host2:9300
-elasticsearch.nb.shards=1
-elasticsearch.nb.replica=0
+elasticsearch.nb.shards=5
+elasticsearch.nb.replica=1
elasticsearch.retryConnection.maxRetries=7
elasticsearch.retryConnection.minDelay=3000
# Index or not attachments (default value: true)
http://git-wip-us.apache.org/repos/asf/james-project/blob/163db061/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties
index 1adf0d2..b50a335 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties
@@ -26,8 +26,8 @@ elasticsearch.port=9300
# You can alternatively provide a list of hosts following this format :
# elasticsearch.hosts=host1:9300,host2:9300
-elasticsearch.nb.shards=1
-elasticsearch.nb.replica=0
+elasticsearch.nb.shards=5
+elasticsearch.nb.replica=1
elasticsearch.retryConnection.maxRetries=7
elasticsearch.retryConnection.minDelay=3000
# Index or not attachments (default value: true)
@@ -39,4 +39,4 @@ elasticsearch.http.host=elasticsearch
elasticsearch.http.port=9200
elasticsearch.metrics.reports.enabled=true
elasticsearch.metrics.reports.period=30
-elasticsearch.metrics.reports.index=james-metrics
\ No newline at end of file
+elasticsearch.metrics.reports.index=james-metrics
http://git-wip-us.apache.org/repos/asf/james-project/blob/163db061/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties b/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties
index 1adf0d2..b50a335 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties
+++ b/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties
@@ -26,8 +26,8 @@ elasticsearch.port=9300
# You can alternatively provide a list of hosts following this format :
# elasticsearch.hosts=host1:9300,host2:9300
-elasticsearch.nb.shards=1
-elasticsearch.nb.replica=0
+elasticsearch.nb.shards=5
+elasticsearch.nb.replica=1
elasticsearch.retryConnection.maxRetries=7
elasticsearch.retryConnection.minDelay=3000
# Index or not attachments (default value: true)
@@ -39,4 +39,4 @@ elasticsearch.http.host=elasticsearch
elasticsearch.http.port=9200
elasticsearch.metrics.reports.enabled=true
elasticsearch.metrics.reports.period=30
-elasticsearch.metrics.reports.index=james-metrics
\ No newline at end of file
+elasticsearch.metrics.reports.index=james-metrics
http://git-wip-us.apache.org/repos/asf/james-project/blob/163db061/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
index 8d5683e..b7ca934 100644
--- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
+++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
@@ -55,10 +55,6 @@ public class LuceneMessageSearchIndexTest extends AbstractMessageSearchIndexTest
this.messageSearchIndex = luceneMessageSearchIndex;
}
- /**
- * 15 tests out of 54 are failing
- */
-
@Ignore
@Override
public void uidShouldreturnEveryThing() throws Exception {
@@ -144,4 +140,8 @@ public class LuceneMessageSearchIndexTest extends AbstractMessageSearchIndexTest
public void multimailboxSearchShouldReturnUidOfMessageMarkedAsSeenInAllMailboxes() throws MailboxException {
}
+ @Ignore("Lucene implementation is not handling mail addresses with names")
+ @Override
+ public void sortOnToShouldWork() {
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/163db061/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
index 4e0d5b2..e60475e 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
@@ -1051,11 +1051,11 @@ public abstract class AbstractMessageSearchIndexTest {
searchQuery.setSorts(ImmutableList.of(new Sort(SortClause.MailboxFrom)));
assertThat(messageSearchIndex.search(session, mailbox, searchQuery))
- .containsExactly(m2.getUid(), m3.getUid(), m4.getUid(), m5.getUid());
- // 2 : jira2@apache.org
- // 3 : jira1@apache.org
- // 4 : jira@apache.org
- // 5 : mailet-api@james.apache.org
+ .containsExactly(m3.getUid(), m2.getUid(), m4.getUid(), m5.getUid());
+ // m3 : jira1@apache.org
+ // m2 : jira2@apache.org
+ // m4 : jira@apache.org
+ // m5 : mailet-api@james.apache.org
}
@Test
@@ -1065,11 +1065,11 @@ public abstract class AbstractMessageSearchIndexTest {
searchQuery.setSorts(ImmutableList.of(new Sort(SortClause.MailboxTo)));
assertThat(messageSearchIndex.search(session, mailbox, searchQuery))
- .containsExactly(m5.getUid(), m2.getUid(), m3.getUid(), m4.getUid());
- // 2 : server-dev@james.apache.org
- // 3 : server-dev@james.apache.org
- // 4 : server-dev@james.apache.org
- // 5 : mailet-api@james.apache.org
+ .containsExactly(m5.getUid(), m3.getUid(), m2.getUid(), m4.getUid());
+ // 5 : "zzz" <ma...@james.apache.org>
+ // 3 : "aaa" <se...@james.apache.org>
+ // 2 : "abc" <se...@james.apache.org>
+ // 4 : "server" <se...@james.apache.org>
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org