Revision: 8069
http://sourceforge.net/p/bigdata/code/8069
Author: thompsonbry
Date: 2014-04-07 12:14:07 +0000 (Mon, 07 Apr 2014)
Log Message:
-----------
Bug fix for interrupt handling for the distributed scale-out job execution logic in the redirect and split handling test cases.
See #871 (interrupt handling code review).
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithRedirect.java
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithRedirect.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithRedirect.java 2014-04-07 12:09:43 UTC (rev 8068)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithRedirect.java 2014-04-07 12:14:07 UTC (rev 8069)
@@ -496,6 +496,7 @@
}
+ @Override
public Void call() throws Exception {
final KeyBuilder keyBuilder = new KeyBuilder(4);
@@ -529,7 +530,7 @@
}
- if (Thread.currentThread().isInterrupted()) {
+ if (Thread.interrupted()) {
if (log.isInfoEnabled())
log.info("Producer interrupted.");
@@ -591,7 +592,7 @@
while(!halt.get()) {
- if(Thread.currentThread().isInterrupted()) {
+ if(Thread.interrupted()) {
if(log.isInfoEnabled())
log.info("Redirecter interrupted.");
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java 2014-04-07 12:09:43 UTC (rev 8068)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java 2014-04-07 12:14:07 UTC (rev 8069)
@@ -496,7 +496,7 @@
+ minProducerDelay);
if (halt.get()
- || Thread.currentThread().isInterrupted()) {
+ || Thread.interrupted()) {
if (log.isInfoEnabled())
log.info("Producer halting.");
@@ -575,7 +575,7 @@
for (Op op : schedule) {
- if (halt.get() || Thread.currentThread().isInterrupted()) {
+ if (halt.get() || Thread.interrupted()) {
if (log.isInfoEnabled())
log.info("Redirecter halting.");
@@ -593,7 +593,7 @@
Thread.sleep(delayMillis);
- if (halt.get() || Thread.currentThread().isInterrupted()) {
+ if (halt.get() || Thread.interrupted()) {
if (log.isInfoEnabled())
log.info("Redirecter halting.");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
