aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-server-benchmarks
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2015-09-10 16:18:33 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2015-09-14 21:46:39 +0200
commit6753155e4dd6d1ccb800703ded086cc601d9a405 (patch)
treefa01f195eb3b7ef00b669ff7056abf3cfb9391f0 /server/sonar-server-benchmarks
parente296ddad533fd911670c391cb87ca348b2c85ba9 (diff)
downloadsonarqube-6753155e4dd6d1ccb800703ded086cc601d9a405.tar.gz
sonarqube-6753155e4dd6d1ccb800703ded086cc601d9a405.zip
Upgrade to Elasticsearch 1.7.1
Diffstat (limited to 'server/sonar-server-benchmarks')
-rw-r--r--server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/IssueIndexBenchmarkTest.java2
1 files changed, 1 insertions, 1 deletions
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);