aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-search
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2015-03-13 17:43:27 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2015-03-17 15:21:43 +0100
commit5e691b5d2c39e58a626b8ed29207cdcab1bb1223 (patch)
treefe762b7abf7784550fd4cae800d2c2345eef76f1 /server/sonar-search
parent698475e10b0f3cfedb87399cae0711eded0d416b (diff)
downloadsonarqube-5e691b5d2c39e58a626b8ed29207cdcab1bb1223.tar.gz
sonarqube-5e691b5d2c39e58a626b8ed29207cdcab1bb1223.zip
Improve db migration from 5.0 and indexing step at server startup
* Parallel bulk indexing of documents into Elasticsearch * reduce memory consumption when building JSON requests * no need to change type of column PROJECT_MEASURES.MEASURE_DATE as it is not used * fix created_at/updated_at fields of manual_measure when saved from Rails * remove usage of deprecated delete-by-query
Diffstat (limited to 'server/sonar-search')
-rw-r--r--server/sonar-search/src/main/java/org/sonar/search/SearchServer.java2
-rw-r--r--server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java3
2 files changed, 2 insertions, 3 deletions
diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
index f5b601ce21c..fdc575277d2 100644
--- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
@@ -42,7 +42,7 @@ public class SearchServer implements Monitored {
public void start() {
LoggerFactory.getLogger(SearchServer.class).info("Starting Elasticsearch[{}] on port {}", settings.clusterName(), settings.tcpPort());
- node = new InternalNode(settings.build(), true);
+ node = new InternalNode(settings.build(), false);
node.start();
}
diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java b/server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java
index fe781338179..258c44fce09 100644
--- a/server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java
@@ -151,8 +151,7 @@ class SearchSettings {
private void configureStorage(ImmutableSettings.Builder builder) {
builder
.put("index.number_of_shards", "1")
- .put("index.refresh_interval", "30s")
- .put("indices.store.throttle.type", "none");
+ .put("index.refresh_interval", "30s");
}
private void configureCluster(ImmutableSettings.Builder builder) {