Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/2855
Change subject: [NO ISSUE] Don't log interrupts as WARNings
......................................................................
[NO ISSUE] Don't log interrupts as WARNings
Change-Id: I0e847b8197fa12f1ce235dde404df24196939a83
---
M
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExceptionUtils.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/NotifyTaskFailureWork.java
M
hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
5 files changed, 18 insertions(+), 8 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/55/2855/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExceptionUtils.java
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExceptionUtils.java
index bba0de7..9c0797e 100644
---
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExceptionUtils.java
+++
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExceptionUtils.java
@@ -130,4 +130,7 @@
return current;
}
+ public static boolean causedByInterrupt(Throwable th) {
+ return getRootCause(th) instanceof InterruptedException;
+ }
}
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 f6531d7..252fe97 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
@@ -355,10 +355,11 @@
if (!exceptions.isEmpty()) {
if (LOGGER.isWarnEnabled()) {
for (int i = 0; i < exceptions.size(); i++) {
- LOGGER.log(Level.WARN,
- "Task " + taskAttemptId + " failed with exception"
+ Exception e = exceptions.get(i);
+ LOGGER.log(ExceptionUtils.causedByInterrupt(e) ?
Level.DEBUG : Level.WARN,
+ "Task failed with exception"
+ (exceptions.size() > 1 ? "s (" + (i + 1)
+ "/" + exceptions.size() + ")" : ""),
- exceptions.get(i));
+ e);
}
}
ExceptionUtils.setNodeIds(exceptions, ncs.getId());
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java
index 37f33a9..96cbc35 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java
@@ -30,6 +30,7 @@
import org.apache.hyracks.api.io.IIOManager;
import org.apache.hyracks.api.partitions.IPartition;
import org.apache.hyracks.api.partitions.PartitionId;
+import org.apache.hyracks.api.util.ExceptionUtils;
import org.apache.hyracks.control.common.job.PartitionState;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
@@ -89,7 +90,7 @@
Thread thread = Thread.currentThread();
setDataConsumerThread(thread); // Sets the data consumer
thread to the current thread.
try {
-
thread.setName(MaterializingPipelinedPartition.class.getName() + " " + pid);
+
thread.setName(MaterializingPipelinedPartition.this.getClass().getSimpleName()
+ " " + pid);
FileReference fRefCopy;
synchronized (MaterializingPipelinedPartition.this) {
while (fRef == null && !eos && !failed) {
@@ -164,7 +165,8 @@
}
}
} catch (Exception e) {
- LOGGER.warn("Failure writing to a frame", e);
+ LOGGER.log(ExceptionUtils.causedByInterrupt(e) ?
Level.DEBUG : Level.WARN,
+ "Failure writing to a frame", e);
} finally {
setDataConsumerThread(null); // Sets back the data
consumer thread to null.
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/NotifyTaskFailureWork.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/NotifyTaskFailureWork.java
index 7dbb3c2..b0c60aa 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/NotifyTaskFailureWork.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/NotifyTaskFailureWork.java
@@ -23,6 +23,7 @@
import org.apache.hyracks.api.dataflow.TaskAttemptId;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.result.IResultPartitionManager;
+import org.apache.hyracks.api.util.ExceptionUtils;
import org.apache.hyracks.control.common.work.AbstractWork;
import org.apache.hyracks.control.nc.NodeControllerService;
import org.apache.hyracks.control.nc.Task;
@@ -49,8 +50,9 @@
@Override
public void run() {
- LOGGER.log(Level.WARN, ncs.getId() + " is sending a notification to cc
that task " + taskId + " has failed",
- exceptions.get(0));
+ Exception ex = exceptions.get(0);
+ LOGGER.log(ExceptionUtils.causedByInterrupt(ex) ? Level.DEBUG :
Level.WARN, "task " + taskId + " has failed",
+ ex);
try {
IResultPartitionManager resultPartitionManager =
ncs.getResultPartitionManager();
if (resultPartitionManager != null) {
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
index 5d8a701..f8b9a57 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
@@ -46,6 +46,7 @@
import org.apache.hyracks.api.io.IIOManager;
import org.apache.hyracks.api.lifecycle.ILifeCycleComponent;
import org.apache.hyracks.api.replication.IIOReplicationManager;
+import org.apache.hyracks.api.util.ExceptionUtils;
import org.apache.hyracks.api.util.IoUtil;
import org.apache.hyracks.storage.common.file.BufferedFileHandle;
import org.apache.hyracks.storage.common.file.IFileMapManager;
@@ -193,7 +194,8 @@
tryRead(cPage);
cPage.valid = true;
} catch (Exception e) {
- LOGGER.log(Level.WARN, "Failure while trying to read a
page from disk", e);
+ LOGGER.log(ExceptionUtils.causedByInterrupt(e) ?
Level.DEBUG : Level.WARN,
+ "Failure while trying to read a page from
disk", e);
throw e;
} finally {
if (!cPage.valid) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/2855
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e847b8197fa12f1ce235dde404df24196939a83
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>
