[ASTERIXDB-3472][HYR] Catch Task exceptions
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
When executing a Task, catch any exception from the different try blocks
to prevent the loss of the original exception.
This patch includes cherry-picks from:
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18317
Ext-ref: MB-63044
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18565
(cherry picked from commit 225f47c44434ff7a178caf6c95131482e39cac26)
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18664
(cherry picked from commit 205de9112a0142908c19a18d07e9ae11cac6d482)
Change-Id: I279f97d272d07092b56038dc24c367137577e452
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18883
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Ali Alsuliman <ali.al.solaiman@gmail.com>
Reviewed-by: Murtadha Hubail <mhubail@apache.org>
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameReader.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameReader.java
index 62eacc8..3e7e2ab 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameReader.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameReader.java
@@ -20,7 +20,7 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
-public interface IFrameReader {
+public interface IFrameReader extends AutoCloseable {
void open() throws HyracksDataException;
boolean nextFrame(IFrame frame) throws HyracksDataException;
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameWriter.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameWriter.java
index 19d7afb..a49f226 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameWriter.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameWriter.java
@@ -56,7 +56,7 @@
* Note: If the call to {@link IFrameWriter#open()} failed, the {@link IFrameWriter#close()} must still be called by the
* producer.
*/
-public interface IFrameWriter {
+public interface IFrameWriter extends AutoCloseable {
/**
* First call to allocate any resources.
*/
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IPartitionCollector.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IPartitionCollector.java
index 4a977ec..7b52875 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IPartitionCollector.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IPartitionCollector.java
@@ -25,7 +25,7 @@
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.partitions.PartitionId;
-public interface IPartitionCollector {
+public interface IPartitionCollector extends AutoCloseable {
public JobId getJobId();
public ConnectorDescriptorId getConnectorId();
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/CleanupUtils.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/CleanupUtils.java
index 220311e..43fa1a7 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/CleanupUtils.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/CleanupUtils.java
@@ -102,6 +102,41 @@
}
}
+ public static Throwable close(AutoCloseable[] closables, Throwable root) {
+ return close(closables, root, false);
+ }
+
+ public static Throwable closeSilently(AutoCloseable[] closables, Throwable root) {
+ return close(closables, root, true);
+ }
+
+ /**
+ * Close the AutoCloseable and suppress any Throwable thrown by the close call.
+ * This method must NEVER throw any Throwable
+ *
+ * @param closables
+ * the resource to close
+ * @param root
+ * the first exception encountered during release of resources
+ * @return the root Throwable if not null or a new Throwable if any was thrown, otherwise, it returns null
+ */
+ private static Throwable close(AutoCloseable[] closables, Throwable root, boolean silent) {
+ if (closables != null) {
+ for (AutoCloseable closable : closables) {
+ root = close(closable, root, silent);
+ }
+ }
+ return root;
+ }
+
+ public static Throwable close(AutoCloseable closable, Throwable root) {
+ return close(closable, root, false);
+ }
+
+ public static Throwable closeSilently(AutoCloseable closable, Throwable root) {
+ return close(closable, root, true);
+ }
+
/**
* Close the AutoCloseable and suppress any Throwable thrown by the close call.
* This method must NEVER throw any Throwable
@@ -112,16 +147,18 @@
* the first exception encountered during release of resources
* @return the root Throwable if not null or a new Throwable if any was thrown, otherwise, it returns null
*/
- public static Throwable close(AutoCloseable closable, Throwable root) {
+ private static Throwable close(AutoCloseable closable, Throwable root, boolean silent) {
if (closable != null) {
try {
closable.close();
} catch (Throwable th) { // NOSONAR Will be suppressed
- try {
- LOGGER.log(ExceptionUtils.causedByInterrupt(th) ? Level.DEBUG : Level.WARN,
- "Failure closing a closeable resource", th);
- } catch (Throwable loggingFailure) { // NOSONAR: Ignore catching Throwable
- // NOSONAR ignore logging failure
+ if (!silent) {
+ try {
+ LOGGER.log(ExceptionUtils.causedByInterrupt(th) ? Level.DEBUG : Level.WARN,
+ "Failure closing a closeable resource", th);
+ } catch (Throwable loggingFailure) { // NOSONAR: Ignore catching Throwable
+ // NOSONAR ignore logging failure
+ }
}
root = ExceptionUtils.suppress(root, th); // NOSONAR
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
index 900ac7e..8a1bbda 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
@@ -63,6 +63,7 @@
import org.apache.hyracks.api.partitions.PartitionId;
import org.apache.hyracks.api.resources.IDeallocatable;
import org.apache.hyracks.api.result.IResultPartitionManager;
+import org.apache.hyracks.api.util.CleanupUtils;
import org.apache.hyracks.api.util.ExceptionUtils;
import org.apache.hyracks.api.util.JavaSerializationUtils;
import org.apache.hyracks.control.common.job.PartitionState;
@@ -406,6 +407,7 @@
if (aborted) {
return;
}
+ Throwable originalEx = null;
try {
collector.open();
try {
@@ -430,23 +432,24 @@
buffer.compact();
}
} catch (Exception e) {
- try {
- writer.fail();
- } catch (HyracksDataException e1) {
- e.addSuppressed(e1);
- }
- throw e;
+ originalEx = e;
+ CleanupUtils.fail(writer, originalEx);
} finally {
- writer.close();
+ originalEx = CleanupUtils.closeSilently(writer, originalEx);
}
} finally {
- reader.close();
+ originalEx = CleanupUtils.closeSilently(reader, originalEx);
}
+ } catch (Exception e) {
+ originalEx = ExceptionUtils.suppress(originalEx, e);
} finally {
- collector.close();
+ originalEx = CleanupUtils.closeSilently(collector, originalEx);
}
} catch (Exception e) {
- throw HyracksDataException.create(e);
+ originalEx = ExceptionUtils.suppress(originalEx, e);
+ }
+ if (originalEx != null) {
+ throw HyracksDataException.create(originalEx);
}
}