From 61f091b6e5042e3ed2cb362997aaef093c96fc63 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@graylog.com>
Date: Mon, 6 Jul 2015 10:55:11 +0200
Subject: [PATCH] Use synchronous replication (default) for bulk indexing

Asynchronous replication will be removed in Elasticsearch 2.0. (https://github.com/elastic/elasticsearch/issues/10114)

Closes #1264
---
 .../src/main/java/org/graylog2/indexer/indices/Indices.java    | 1 -
 .../src/main/java/org/graylog2/indexer/messages/Messages.java  | 3 +--
 2 files changed, 1 insertion(+), 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
index ce59607b7b6a..6cbf511b4d22 100644
--- a/graylog2-server/src/main/java/org/graylog2/indexer/indices/Indices.java
+++ b/graylog2-server/src/main/java/org/graylog2/indexer/indices/Indices.java
@@ -120,7 +120,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
index db8540a94737..1bc580c27639 100644
--- 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();