From 6753155e4dd6d1ccb800703ded086cc601d9a405 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 10 Sep 2015 16:18:33 +0200
Subject: [PATCH] Upgrade to Elasticsearch 1.7.1

---
 pom.xml                                                        | 2 +-
 .../org/sonar/server/benchmark/IssueIndexBenchmarkTest.java    | 2 +-
 .../src/main/java/org/sonar/server/es/EsClient.java            | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cdd7e9afe9f..917543527d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
     <logback.version>1.1.3</logback.version>
     <slf4j.version>1.7.12</slf4j.version>
     <tomcat.version>8.0.18</tomcat.version>
-    <elasticsearch.version>1.4.4</elasticsearch.version>
+    <elasticsearch.version>1.7.1</elasticsearch.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.min.version>3.2</maven.min.version>
     <jdk.min.version>1.7</jdk.min.version>
diff --git a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/IssueIndexBenchmarkTest.java b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/IssueIndexBenchmarkTest.java
index 05dc434bb51..cc0ae492ac2 100644
--- a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/IssueIndexBenchmarkTest.java
+++ b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/IssueIndexBenchmarkTest.java
@@ -117,7 +117,7 @@ public class IssueIndexBenchmarkTest {
     benchmark.expectAround("Throughput to index issues", throughputPerSecond, 6500, Benchmark.DEFAULT_ERROR_MARGIN_PERCENTS);
 
     // be sure that physical files do not evolve during estimation of size
-    tester.get(EsClient.class).prepareOptimize("issues").setWaitForMerge(true).get();
+    tester.get(EsClient.class).prepareOptimize("issues").get();
     long dirSize = FileUtils.sizeOfDirectory(tester.getEsServerHolder().getHomeDir());
     LOGGER.info(String.format("ES dir: " + FileUtils.byteCountToDisplaySize(dirSize)));
     benchmark.expectBetween("ES dir size (b)", dirSize, 200L * FileUtils.ONE_MB, 420L * FileUtils.ONE_MB);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/EsClient.java b/server/sonar-server/src/main/java/org/sonar/server/es/EsClient.java
index 61e61608210..13a3400b961 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/es/EsClient.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/es/EsClient.java
@@ -175,8 +175,7 @@ public class EsClient implements Startable {
   public OptimizeRequestBuilder prepareOptimize(String indexName) {
     // TODO add proxy for profiling
     return nativeClient().admin().indices().prepareOptimize(indexName)
-      .setMaxNumSegments(1)
-      .setWaitForMerge(true);
+      .setMaxNumSegments(1);
   }
 
   public ClearIndicesCacheRequestBuilder prepareClearCache(String... indices) {
-- 
2.39.5