Merge pull request #1288 from Graylog2/issue-1264

Use synchronous replication for bulk indexing
Graylog2 · Jul 7, 2015 · 9bddcb8 · 9bddcb8
2 parents 3bcee89 + 61f091b
commit 9bddcb8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/indices/Indices.java b/graylog2-server/src/main/java/org/graylog2/indexer/indices/Indices.java
@@ -121,7 +121,6 @@ public void move(String source, String target) {
             }
 
             request.setConsistencyLevel(WriteConsistencyLevel.ONE);
-            request.setReplicationType(ReplicationType.ASYNC);
 
             if (request.numberOfActions() > 0) {
                 BulkResponse response = c.bulk(request.request()).actionGet();

diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/messages/Messages.java b/graylog2-server/src/main/java/org/graylog2/indexer/messages/Messages.java
@@ -98,13 +98,12 @@ public boolean bulkIndex(final List<Message> messages) {
 
         final BulkRequestBuilder request = c.prepareBulk();
         for (Message msg : messages) {
-            request.add(buildIndexRequest(configuration.getIndexPrefix() + "_" + Deflector.DEFLECTOR_SUFFIX,
+            request.add(buildIndexRequest(Deflector.buildName(configuration.getIndexPrefix()),
                                           msg.toElasticSearchObject(),
                                           msg.getId())); // Main index.
         }
 
         request.setConsistencyLevel(WriteConsistencyLevel.ONE);
-        request.setReplicationType(ReplicationType.ASYNC);
 
         final BulkResponse response = c.bulk(request.request()).actionGet();