embulk-executor-mapreduce 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ac810376cbc4895b8745c82dcd642ad8302bf4f
-  data.tar.gz: 34b4f9a372be43b2915878b35954d75c25f7e8d8
+  metadata.gz: d683908af5b1f5e06ea035f9ecd4e7a89dbd4eab
+  data.tar.gz: f8a5a7db822f6241a40211dd1782e4fda83df073
 SHA512:
-  metadata.gz: 96fd33f8766a7510776f8253702c04291e675ea62c6ed05cca05958c905383770afc63d4056df1aaa8bac8be4d0175ba5dd4ada150d86a31b6375e2d1a7c222f
-  data.tar.gz: 01c46e09dd99360ce835ba419819da22d2a711b8a4cebf47382cb19092730e1608f76ae80bf79f498cc363fdbda0f0fd1fc4932a592e76f0b264b7b1e055d7a4
+  metadata.gz: 48b955f8b5a70864dd745347079cc83545fdb6953091812917beeb28e6aa9f66726c68e8b85b0aa3c8da40f419fc0b1efa78aab90bd899e42bb4c1a0c14edaae
+  data.tar.gz: 99199b98f4f56e2d5d74c7f12be41b19bd31aa3f496144a940b16c6c53abf3980c181ae186f40ba3bf307106abb53dc00683c54157ea000652d24d66cff12cd5

data/src/main/java/org/embulk/executor/mapreduce/AttemptState.java

@@ -17,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import org.apache.hadoop.mapreduce.TaskAttemptID;
 import org.embulk.config.ModelManager;
 import org.embulk.config.TaskReport;
+import org.embulk.config.UserDataExceptions;
 
 public class AttemptState
 {
@@ -24,6 +25,7 @@ public class AttemptState
     private final Optional<Integer> inputTaskIndex;
     private final Optional<Integer> outputTaskIndex;
     private Optional<String> exception;
+    private boolean userDataException;
     private Optional<TaskReport> inputTaskReport;
     private Optional<TaskReport> outputTaskReport;
 
@@ -40,11 +42,13 @@ public class AttemptState
             @JsonProperty("inputTaskIndex") Optional<Integer> inputTaskIndex,
             @JsonProperty("outputTaskIndex") Optional<Integer> outputTaskIndex,
             @JsonProperty("exception") Optional<String> exception,
+            @JsonProperty("userDataException") boolean userDataException,
             @JsonProperty("inputTaskReport") Optional<TaskReport> inputTaskReport,
             @JsonProperty("outputTaskReport") Optional<TaskReport> outputTaskReport)
     {
         this(TaskAttemptID.forName(attemptId),
-                inputTaskIndex, outputTaskIndex, exception,
+                inputTaskIndex, outputTaskIndex,
+                exception, userDataException,
                 inputTaskReport, outputTaskReport);
     }
 
@@ -53,6 +57,7 @@ public class AttemptState
             Optional<Integer> inputTaskIndex,
             Optional<Integer> outputTaskIndex,
             Optional<String> exception,
+            boolean userDataException,
             Optional<TaskReport> inputTaskReport,
             Optional<TaskReport> outputTaskReport)
     {
@@ -60,6 +65,7 @@ public class AttemptState
         this.inputTaskIndex = inputTaskIndex;
         this.outputTaskIndex = outputTaskIndex;
         this.exception = exception;
+        this.userDataException = userDataException;
         this.inputTaskReport = inputTaskReport;
         this.outputTaskReport = outputTaskReport;
     }
@@ -97,13 +103,16 @@ public class AttemptState
         } catch (UnsupportedEncodingException ex) {
             throw new RuntimeException(ex);
         }
-        setException(new String(os.toByteArray(), StandardCharsets.UTF_8));
+        setException(
+                new String(os.toByteArray(), StandardCharsets.UTF_8),
+                UserDataExceptions.isUserDataException(exception));
     }
 
     @JsonIgnore
-    public void setException(String exception)
+    public void setException(String exception, boolean userDataException)
     {
         this.exception = Optional.of(exception);
+        this.userDataException = userDataException;
     }
 
     @JsonProperty("exception")
@@ -112,6 +121,12 @@ public class AttemptState
         return exception;
     }
 
+    @JsonProperty("userDataException")
+    public boolean isUserDataException()
+    {
+        return userDataException;
+    }
+
     @JsonProperty("inputTaskReport")
     public Optional<TaskReport> getInputTaskReport()
     {

data/src/main/java/org/embulk/executor/mapreduce/MapReduceExecutor.java

@@ -409,7 +409,13 @@ public class MapReduceExecutor
         boolean committed = taskReport.isPresent();
         if (attempt.getException().isPresent()) {
             if (!state.isCommitted()) {
-                state.setException(new RemoteTaskFailedException(attempt.getException().get()));
+                Exception remoteException;
+                if (attempt.isUserDataException()) {
+                    remoteException = new RemoteTaskFailedDataException(attempt.getException().get());
+                } else {
+                    remoteException = new RemoteTaskFailedException(attempt.getException().get());
+                }
+                state.setException(remoteException);
             }
         }
         if (taskReport.isPresent()) {

data/src/main/java/org/embulk/executor/mapreduce/RemoteTaskFailedDataException.java

@@ -0,0 +1,12 @@
+package org.embulk.executor.mapreduce;
+
+import org.embulk.spi.DataException;
+
+public class RemoteTaskFailedDataException
+        extends DataException
+{
+    public RemoteTaskFailedDataException(String message)
+    {
+        super(message);
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-executor-mapreduce
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies: []
 description: Executes tasks on Hadoop.
 email:
@@ -35,6 +35,7 @@ files:
 - src/main/java/org/embulk/executor/mapreduce/Partitioner.java
 - src/main/java/org/embulk/executor/mapreduce/Partitioning.java
 - src/main/java/org/embulk/executor/mapreduce/PluginArchive.java
+- src/main/java/org/embulk/executor/mapreduce/RemoteTaskFailedDataException.java
 - src/main/java/org/embulk/executor/mapreduce/RemoteTaskFailedException.java
 - src/main/java/org/embulk/executor/mapreduce/SetContextClassLoader.java
 - src/main/java/org/embulk/executor/mapreduce/TimestampPartitioning.java
@@ -61,7 +62,7 @@ files:
 - classpath/curator-client-2.6.0.jar
 - classpath/curator-framework-2.6.0.jar
 - classpath/curator-recipes-2.6.0.jar
-- classpath/embulk-executor-mapreduce-0.2.1.jar
+- classpath/embulk-executor-mapreduce-0.2.2.jar
 - classpath/gson-2.2.4.jar
 - classpath/hadoop-annotations-2.6.0.jar
 - classpath/hadoop-auth-2.6.0.jar