embulk-output-elasticsearch 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 820af0df51a3e46cfd59a26c60e1fd219134b685
-  data.tar.gz: c6fdea4eaa6fe4a26e85c2ee1b5c623224daa317
+  metadata.gz: 3be5c4aa4a859ab429375abbbb219665ea4036c0
+  data.tar.gz: 75f3d82aa911310d760f8669ab6c27ae6b8aa65d
 SHA512:
-  metadata.gz: 81a1fe781d1e176fd8da2c3af19d3ddb1dd5a5dec519f887d072be420224d0168a0ea54f2621a7e50417740320b28f056b0504228bdc826c68e8173bc3bb13b7
-  data.tar.gz: d18bc4da9ea81201e72e21d02ec859b5f2a1e2078fd8c1c3a90bd4a01d361746b2b75aedc3baf50098f0b93d2f1ae4993b31eba2cbdd2d8f99d61194220c6a41
+  metadata.gz: e606d402f49e8b7945e220e7a3fbdda72b4a86dc9a012155dc7bd2c94808ebd870b96af7fd551e8c9360e1ff4a707cb2b5f48f032ab69324347b1b431b3d007c
+  data.tar.gz: fb66e9cce399d2aa864330526524c2c4de8ed5ea48296fae0a89b7565e68cf653da3ecfc901e0317008e208714ac4321333d1962a9d4a79fd0c503814573f9a3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.3 - 2017-06-12
+
+* [maintenance] Improve exception handling [#38](https://github.com/muga/embulk-output-elasticsearch/pull/38)
+* [maintenance] Fix ElasticsearchRecordBuffer to call retryHelper.close() [#39](https://github.com/muga/embulk-output-elasticsearch/pull/39)
+
 ## 0.4.2 - 2017-05-31
 
 * [maintenance] Update embulk-base-restclient to fix ArrayIndexOutOfBoundsException [#37](https://github.com/muga/embulk-output-elasticsearch/pull/37)

data/build.gradle

@@ -18,7 +18,7 @@ configurations {
     provided
 }
 
-version = "0.4.2"
+version = "0.4.3"
 
 compileJava.options.encoding = 'UTF-8' // source encoding
 sourceCompatibility = 1.7

data/src/main/java/org/embulk/output/elasticsearch/ElasticsearchHttpClient.java

@@ -310,50 +310,51 @@ public class ElasticsearchHttpClient
         return sendRequest(path, method, task, retryHelper, "");
     }
 
-    private JsonNode sendRequest(String path, final HttpMethod method, PluginTask task, Jetty92RetryHelper retryHelper, final String content)
+    private JsonNode sendRequest(String path, final HttpMethod method, final PluginTask task, Jetty92RetryHelper retryHelper, final String content)
     {
         final String uri = createRequestUri(task, path);
         final String authorizationHeader = getAuthorizationHeader(task);
 
-        try {
-            String responseBody = retryHelper.requestWithRetry(
-                    new StringJetty92ResponseEntityReader(task.getTimeoutMills()),
-                    new Jetty92SingleRequester() {
-                        @Override
-                        public void requestOnce(org.eclipse.jetty.client.HttpClient client, org.eclipse.jetty.client.api.Response.Listener responseListener)
-                        {
-                            org.eclipse.jetty.client.api.Request request = client
-                                    .newRequest(uri)
-                                    .accept("application/json")
-                                    .method(method);
-                            if (method == HttpMethod.POST) {
-                                request.content(new StringContentProvider(content), "application/json");
-                            }
-
-                            if (!authorizationHeader.isEmpty()) {
-                                request.header("Authorization", authorizationHeader);
-                            }
-                            request.send(responseListener);
+        String responseBody = retryHelper.requestWithRetry(
+                new StringJetty92ResponseEntityReader(task.getTimeoutMills()),
+                new Jetty92SingleRequester() {
+                    @Override
+                    public void requestOnce(org.eclipse.jetty.client.HttpClient client, org.eclipse.jetty.client.api.Response.Listener responseListener)
+                    {
+                        org.eclipse.jetty.client.api.Request request = client
+                                .newRequest(uri)
+                                .accept("application/json")
+                                .method(method);
+                        if (method == HttpMethod.POST) {
+                            request.content(new StringContentProvider(content), "application/json");
                         }
 
-                        @Override
-                        public boolean isResponseStatusToRetry(org.eclipse.jetty.client.api.Response response)
-                        {
-                            int status = response.getStatus();
-                            if (status == 429) {
-                                return true;  // Retry if 429.
-                            }
-                            return status / 100 != 4;  // Retry unless 4xx except for 429.
+                        if (!authorizationHeader.isEmpty()) {
+                            request.header("Authorization", authorizationHeader);
                         }
-                    });
-            return parseJson(responseBody);
-        }
-        catch (HttpResponseException ex) {
-            if (ex.getMessage().startsWith("Response not 2xx: 404 Not Found")) {
-                throw new ResourceNotFoundException(ex);
-            }
-            throw ex;
-        }
+                        request.send(responseListener);
+                    }
+
+                    @Override
+                    public boolean isExceptionToRetry(Exception exception)
+                    {
+                        return task.getId().isPresent();
+                    }
+
+                    @Override
+                    public boolean isResponseStatusToRetry(org.eclipse.jetty.client.api.Response response)
+                    {
+                        int status = response.getStatus();
+                        if (status == 404) {
+                            throw new ResourceNotFoundException("Requested resource was not found");
+                        }
+                        else if (status == 429) {
+                            return true;  // Retry if 429.
+                        }
+                        return status / 100 != 4;  // Retry unless 4xx except for 429.
+                    }
+                });
+        return parseJson(responseBody);
     }
 
     private String createRequestUri(PluginTask task, String path)
@@ -403,6 +404,11 @@ public class ElasticsearchHttpClient
         {
         }
 
+        public ResourceNotFoundException(String message)
+        {
+            super(message);
+        }
+
         public ResourceNotFoundException(Throwable cause)
         {
             super(cause);

data/src/main/java/org/embulk/output/elasticsearch/ElasticsearchRecordBuffer.java

@@ -88,12 +88,15 @@ public class ElasticsearchRecordBuffer
     @Override
     public TaskReport commitWithTaskReportUpdated(TaskReport taskReport)
     {
-        if (records.size() > 0) {
-            client.push(records, task, retryHelper);
-            log.info("Inserted {} records", records.size());
+        try {
+            if (records.size() > 0) {
+                client.push(records, task, retryHelper);
+                log.info("Inserted {} records", records.size());
+            }
+            return Exec.newTaskReport().set("inserted", totalCount);
+        }
+        finally {
+            this.retryHelper.close();
         }
-
-        this.retryHelper.close();
-        return Exec.newTaskReport().set("inserted", totalCount);
     }
 }

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: bundler
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+        version: '10.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: test-unit
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
+        version: 3.0.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.2
-  name: test-unit
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.2
 description: Elasticsearch output plugin is an Embulk plugin that loads records to Elasticsearch read by any input plugins. Search the input plugins by "embulk-input" keyword.
 email:
 - muga.nishizawa@gmail.com
@@ -83,7 +83,7 @@ files:
 - src/test/java/org/embulk/output/elasticsearch/TestElasticsearchOutputPlugin.java
 - src/test/resources/sample_01.csv
 - classpath/embulk-base-restclient-0.5.2.jar
-- classpath/embulk-output-elasticsearch-0.4.2.jar
+- classpath/embulk-output-elasticsearch-0.4.3.jar
 - classpath/embulk-util-retryhelper-jetty92-0.5.2.jar
 - classpath/jetty-client-9.2.14.v20151106.jar
 - classpath/jetty-http-9.2.14.v20151106.jar