[Bigdata-commit] SF.net SVN: bigdata:[4109] branches/QUADS_QUERY_BRANCH/bigdata/src/java/com /bigdata/bop/engine/ChunkedRunningQuery.java

[<tho...@us...>]

Revision: 4109
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4109&view=rev
Author:   thompsonbry
Date:     2011-01-16 16:58:40 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
Found and closed off the source of the stack trace documented at [1].  This trace was actually just a logged error rather than being thrown out of the query to the SPARQL client.  The exception occurred when startOp() attempted to start a new chunk task but the running query had been asynchronously terminated by an interrupt.  The error handling logic now logs an error iff IHaltable#getCause() returns non-null.

[1] https://sourceforge.net/apps/trac/bigdata/ticket/230#comment:1

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java	2011-01-16 16:38:37 UTC (rev 4108)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java	2011-01-16 16:58:40 UTC (rev 4109)
@@ -890,10 +890,6 @@
                 
             } catch (Throwable ex1) {
 
-				// Log an error.
-                log.error("queryId=" + getQueryId() + ", bopId=" + t.bopId
-                        + ", bop=" + t.bop, ex1);
-                
                 /*
                  * Mark the query as halted on this node regardless of whether
                  * we are able to communicate with the query controller.
@@ -906,6 +902,14 @@
                 // ensure halted.
                 halt(ex1);
 
+				if (getCause() != null) {
+
+					// Log an error (abnormal termination only).
+					log.error("queryId=" + getQueryId() + ", bopId=" + t.bopId
+							+ ", bop=" + t.bop, ex1);
+
+				}
+                
                 final HaltOpMessage msg = new HaltOpMessage(getQueryId(), t.bopId,
                         t.partitionId, serviceId, getCause()/*firstCauseIfError*/, t.sinkId,
                         t.sinkMessagesOut.get(), t.altSinkId,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.