Merge branch '5.0.x' into 5.1.x

wicknicks · wicknicks · commit 00b265f1e93f · 2019-03-19T10:51:08.000-07:00
diff --git a/src/main/java/io/confluent/connect/elasticsearch/ElasticsearchSinkConnectorConfig.java b/src/main/java/io/confluent/connect/elasticsearch/ElasticsearchSinkConnectorConfig.java
@@ -148,6 +148,11 @@ public class ElasticsearchSinkConnectorConfig extends AbstractConfig {
       + " mapping conflict or a field name containing illegal characters. Valid options are "
       + "'ignore', 'warn', and 'fail'.";
 
+  public static final String AUTO_CREATE_INDICES_AT_START_CONFIG = "auto.create.indices.at.start";
+  private static final String AUTO_CREATE_INDICES_AT_START_DOC = "Auto create the Elasticsearch"
+      + " indices at startup. This is useful when the indices are a direct mapping "
+      + " of the Kafka topics.";
+
   protected static ConfigDef baseConfigDef() {
     final ConfigDef configDef = new ConfigDef();
     addConnectorConfigs(configDef);
@@ -273,10 +278,21 @@ private static void addConnectorConfigs(ConfigDef configDef) {
         3000, 
         Importance.LOW, 
         READ_TIMEOUT_MS_CONFIG_DOC,
-        group, 
-        ++order, 
-        Width.SHORT, 
-        "Read Timeout");
+        group,
+        ++order,
+        Width.SHORT,
+        "Read Timeout"
+    ).define(
+        AUTO_CREATE_INDICES_AT_START_CONFIG,
+        Type.BOOLEAN,
+        true,
+        Importance.LOW,
+        AUTO_CREATE_INDICES_AT_START_DOC,
+        group,
+        ++order,
+        Width.SHORT,
+        "Create indices at startup"
+      );
   }
 
   private static void addConversionConfigs(ConfigDef configDef) {
diff --git a/src/main/java/io/confluent/connect/elasticsearch/ElasticsearchSinkTask.java b/src/main/java/io/confluent/connect/elasticsearch/ElasticsearchSinkTask.java
@@ -39,6 +39,7 @@ public class ElasticsearchSinkTask extends SinkTask {
   private static final Logger log = LoggerFactory.getLogger(ElasticsearchSinkTask.class);
   private ElasticsearchWriter writer;
   private ElasticsearchClient client;
+  private Boolean createIndicesAtStartTime;
 
   @Override
   public String version() {
@@ -90,6 +91,8 @@ public void start(Map<String, String> props, ElasticsearchClient client) {
           config.getInt(ElasticsearchSinkConnectorConfig.MAX_RETRIES_CONFIG);
       boolean dropInvalidMessage =
           config.getBoolean(ElasticsearchSinkConnectorConfig.DROP_INVALID_MESSAGE_CONFIG);
+      boolean createIndicesAtStartTime =
+          config.getBoolean(ElasticsearchSinkConnectorConfig.AUTO_CREATE_INDICES_AT_START_CONFIG);
 
       DataConverter.BehaviorOnNullValues behaviorOnNullValues =
           DataConverter.BehaviorOnNullValues.forValue(
@@ -136,6 +139,8 @@ public void start(Map<String, String> props, ElasticsearchClient client) {
           .setBehaviorOnNullValues(behaviorOnNullValues)
           .setBehaviorOnMalformedDoc(behaviorOnMalformedDoc);
 
+      this.createIndicesAtStartTime = createIndicesAtStartTime;
+
       writer = builder.build();
       writer.start();
     } catch (ConfigException e) {
@@ -149,11 +154,13 @@ public void start(Map<String, String> props, ElasticsearchClient client) {
   @Override
   public void open(Collection<TopicPartition> partitions) {
     log.debug("Opening the task for topic partitions: {}", partitions);
-    Set<String> topics = new HashSet<>();
-    for (TopicPartition tp : partitions) {
-      topics.add(tp.topic());
+    if (createIndicesAtStartTime) {
+      Set<String> topics = new HashSet<>();
+      for (TopicPartition tp : partitions) {
+        topics.add(tp.topic());
+      }
+      writer.createIndicesForTopics(topics);
     }
-    writer.createIndicesForTopics(topics);
   }
 
   @Override
diff --git a/src/main/java/io/confluent/connect/elasticsearch/ElasticsearchWriter.java b/src/main/java/io/confluent/connect/elasticsearch/ElasticsearchWriter.java
@@ -252,6 +252,8 @@ public void write(Collection<SinkRecord> records) {
       final boolean ignoreSchema =
           ignoreSchemaTopics.contains(sinkRecord.topic()) || this.ignoreSchema;
 
+      client.createIndices(Collections.singleton(index));
+
       if (!ignoreSchema && !existingMappings.contains(index)) {
         try {
           if (Mapping.getMapping(client, index, type) == null) {
diff --git a/src/main/java/io/confluent/connect/elasticsearch/jest/JestElasticsearchClient.java b/src/main/java/io/confluent/connect/elasticsearch/jest/JestElasticsearchClient.java
@@ -19,12 +19,12 @@
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.gson.JsonObject;
-import io.confluent.connect.elasticsearch.bulk.BulkRequest;
 import io.confluent.connect.elasticsearch.ElasticsearchClient;
 import io.confluent.connect.elasticsearch.ElasticsearchSinkConnectorConfig;
 import io.confluent.connect.elasticsearch.IndexableRecord;
 import io.confluent.connect.elasticsearch.Key;
 import io.confluent.connect.elasticsearch.Mapping;
+import io.confluent.connect.elasticsearch.bulk.BulkRequest;
 import io.confluent.connect.elasticsearch.bulk.BulkResponse;
 import io.searchbox.action.Action;
 import io.searchbox.action.BulkableAction;
@@ -53,6 +53,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -73,6 +74,8 @@ public class JestElasticsearchClient implements ElasticsearchClient {
   private final JestClient client;
   private final Version version;
 
+  private final Set<String> indexCache = new HashSet<>();
+
   // visible for testing
   public JestElasticsearchClient(JestClient client) {
     try {
@@ -215,7 +218,10 @@ public Version getVersion() {
   }
 
   private boolean indexExists(String index) {
-    Action<JestResult> action = new IndicesExists.Builder(index).build();
+    if (indexCache.contains(index)) {
+      return true;
+    }
+    Action<?> action = new IndicesExists.Builder(index).build();
     try {
       JestResult result = client.execute(action);
       return result.isSucceeded();
@@ -237,6 +243,7 @@ public void createIndices(Set<String> indices) {
               throw new ConnectException("Could not create index '" + index + "'" + msg);
             }
           }
+          indexCache.add(index);
         } catch (IOException e) {
           throw new ConnectException(e);
         }
diff --git a/src/test/java/io/confluent/connect/elasticsearch/ElasticsearchSinkTaskTest.java b/src/test/java/io/confluent/connect/elasticsearch/ElasticsearchSinkTaskTest.java
@@ -21,6 +21,12 @@
 import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.Struct;
 import org.apache.kafka.connect.sink.SinkRecord;
+import org.elasticsearch.action.ActionFuture;
+import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
+import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
+import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.InternalTestCluster;
 import org.junit.Test;
@@ -41,6 +47,11 @@ public class ElasticsearchSinkTaskTest extends ElasticsearchSinkTestBase {
   private static final int PARTITION_113 = 113;
   private static final TopicPartition TOPIC_IN_CAPS_PARTITION = new TopicPartition(TOPIC_IN_CAPS, PARTITION_113);
 
+  private static final String UNSEEN_TOPIC = "UnseenTopic";
+  private static final int PARTITION_114 = 114;
+  private static final TopicPartition UNSEEN_TOPIC_PARTITION = new TopicPartition(UNSEEN_TOPIC, PARTITION_114);
+
+
   private Map<String, String> createProps() {
     Map<String, String> props = new HashMap<>();
     props.put(ElasticsearchSinkConnectorConfig.TYPE_NAME_CONFIG, TYPE);
@@ -93,12 +104,12 @@ public void testCreateAndWriteToIndexForTopicWithUppercaseCharacters() {
     Struct record = createRecord(schema);
 
     SinkRecord sinkRecord = new SinkRecord(TOPIC_IN_CAPS,
-            PARTITION_113,
-            Schema.STRING_SCHEMA,
-            key,
-            schema,
-            record,
-            0 );
+        PARTITION_113,
+        Schema.STRING_SCHEMA,
+        key,
+        schema,
+        record,
+        0 );
 
     try {
       task.start(props, client);
@@ -110,4 +121,46 @@ public void testCreateAndWriteToIndexForTopicWithUppercaseCharacters() {
       task.stop();
     }
   }
+
+  @Test
+  public void testCreateAndWriteToIndexNotCreatedAtStartTime() {
+    InternalTestCluster cluster = ESIntegTestCase.internalCluster();
+    cluster.ensureAtLeastNumDataNodes(3);
+    Map<String, String> props = createProps();
+
+    props.put(ElasticsearchSinkConnectorConfig.AUTO_CREATE_INDICES_AT_START_CONFIG, "false");
+
+    ElasticsearchSinkTask task = new ElasticsearchSinkTask();
+
+    String key = "key";
+    Schema schema = createSchema();
+    Struct record = createRecord(schema);
+
+    SinkRecord sinkRecord = new SinkRecord(UNSEEN_TOPIC,
+        PARTITION_114,
+        Schema.STRING_SCHEMA,
+        key,
+        schema,
+        record,
+        0 );
+
+    task.start(props, client);
+    task.open(new HashSet<>(Collections.singletonList(TOPIC_IN_CAPS_PARTITION)));
+    task.put(Collections.singleton(sinkRecord));
+    task.stop();
+
+    assertTrue(UNSEEN_TOPIC + " index created without errors ",
+        verifyIndexExist(cluster, UNSEEN_TOPIC.toLowerCase()));
+
+  }
+
+  private boolean verifyIndexExist(InternalTestCluster cluster, String ... indices) {
+    ActionFuture<IndicesExistsResponse> action = cluster
+        .client()
+        .admin()
+        .indices()
+        .exists(new IndicesExistsRequest(indices));
+
+    return action.actionGet().isExists();
+  }
 }
