Remove unused BulkIndexer#setRefresh(boolean)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java
index 28384f0f074ae6e5b426346642d74001524730eb..fd6f3fec50c12bd7d427299be597c1fdd217f7f9 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java
@@ -57,7 +57,6 @@ public class BulkIndexer implements Startable {
   private final EsClient client;
   private final String indexName;
   private boolean large = false;
-  private boolean refresh = true;
   private long flushByteSize = FLUSH_BYTE_SIZE;
   private BulkRequestBuilder bulkRequest = null;
   private Map<String, Object> largeInitialSettings = null;
@@ -83,12 +82,6 @@ public class BulkIndexer implements Startable {
     return this;
   }
 
-  public BulkIndexer setRefresh(boolean b) {
-    Preconditions.checkState(bulkRequest == null, ALREADY_STARTED_MESSAGE);
-    this.refresh = b;
-    return this;
-  }
-
   /**
    * Default value is {@link org.sonar.server.es.BulkIndexer#FLUSH_BYTE_SIZE}
    * @see org.elasticsearch.common.unit.ByteSizeValue
@@ -144,9 +137,7 @@ public class BulkIndexer implements Startable {
       progress.stop();
     }
 
-    if (refresh) {
-      client.prepareRefresh(indexName).get();
-    }
+    client.prepareRefresh(indexName).get();
     if (large) {
       // optimize lucene segments and revert index settings
       // Optimization must be done before re-applying replicas:

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java
index f705776bed463e3cc716fec2b340471ba433d9d5..68292b43a93ca9c8b470437546f7d497a610e3ab 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java
@@ -93,6 +93,9 @@ public class IssueIndexDefinition implements IndexDefinition {
   public void define(IndexDefinitionContext context) {
     NewIndex index = context.create(INDEX);
 
+    // refresh is handled by IssueIndexer
+    index.getSettings().put("index.refresh_interval", "-1");
+
     // shards
     boolean clusterMode = settings.getBoolean(ProcessConstants.CLUSTER_ACTIVATE);
     if (clusterMode) {

diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java
index bd4be80943d5f3f84518b3db79e98fe12f911c9f..7f4e4e6a16f1f54615ad3d4fdc26fd992eb7e46a 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java
@@ -48,8 +48,7 @@ public class BulkIndexerTest {
 
   @Test
   public void index_documents() throws Exception {
-    BulkIndexer indexer = new BulkIndexer(esTester.client(), FakeIndexDefinition.INDEX)
-      .setRefresh(true);
+    BulkIndexer indexer = new BulkIndexer(esTester.client(), FakeIndexDefinition.INDEX);
     indexer.start();
     indexer.add(newIndexRequest(42));
     indexer.add(newIndexRequest(78));