Author: cwiklik
Date: Fri Jan 4 14:35:07 2019
New Revision: 1850368
URL: http://svn.apache.org/viewvc?rev=1850368&view=rev
Log:
UIMA-5784 Modified to include cause of failure when replying to client with an
exception
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/ActiveMQMessageSender.java
uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/ControllerLifecycle.java
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/UimacppServiceController.java
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/ActiveMQMessageSender.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/ActiveMQMessageSender.java?rev=1850368&r1=1850367&r2=1850368&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/ActiveMQMessageSender.java
(original)
+++
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/ActiveMQMessageSender.java
Fri Jan 4 14:35:07 2019
@@ -374,7 +374,6 @@ public class ActiveMQMessageSender exten
new Object[] {
cacheEntry.getCasReferenceId(), String.valueOf(cas.hashCode()),
engine.serviceDelegate.toString() });
}
-
} else if (pm.getMessageType() ==
AsynchAEMessage.GetMeta
&&
engine.serviceDelegate.getGetMetaTimeout() > 0) {
// timer for PING has been started in sendCAS()
@@ -409,6 +408,9 @@ public class ActiveMQMessageSender exten
"run", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
"UIMAEE_exception__WARNING", e);
}
+ if (casProcessRequest) {
+
addCasToOutstandingList((String)pm.get(AsynchAEMessage.CasReference));
+ }
} finally {
if (jmsSession != null) {
try {
@@ -420,4 +422,15 @@ public class ActiveMQMessageSender exten
}
}
+ private void addCasToOutstandingList(String casReferenceId) {
+ ClientRequest cacheEntry =
engine.getCache().get(casReferenceId);
+ if (cacheEntry != null) {
+ CAS cas = cacheEntry.getCAS();
+ // Add the cas to a list of CASes pending reply. Also
start the timer if
+ // necessary
+
engine.serviceDelegate.addCasToOutstandingList(cacheEntry.getCasReferenceId(),
cas.hashCode(),
+ engine.timerPerCAS); // true=timer per
cas
+
+ }
+ }
}
\ No newline at end of file
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java?rev=1850368&r1=1850367&r2=1850368&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
(original)
+++
uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
Fri Jan 4 14:35:07 2019
@@ -196,8 +196,8 @@ public class TestUimaASExtended extends
broker2.waitUntilStopped();
System.out.println("..... Stopped broker
............................");
Timer timer = new Timer();
- timer.schedule(new StartBrokerTask(broker2, this),500);
- delay = 200;
+ timer.schedule(new StartBrokerTask(broker2, this),1000);
+ delay =5000;
}
synchronized(appCtx) {
@@ -263,7 +263,7 @@ public class TestUimaASExtended extends
Thread[] clientThreads = new Thread[8];
// Create 4 Uima AS clients each running in a separate thread
- for(int i=0; i < 8; i++) {
+ for(int i=0; i < clientThreads.length; i++) {
clientThreads[i] = new Thread() {
public void run() {
BaseUIMAAsynchronousEngine_impl uimaAsEngine = new
BaseUIMAAsynchronousEngine_impl();
@@ -274,6 +274,7 @@ public class TestUimaASExtended extends
buildContext(broker2.getConnectorByName(DEFAULT_BROKER_URL_KEY_2).getUri().toString(),
"NoOpAnnotatorQueue");
appCtx.put(UimaAsynchronousEngine.Timeout, 1100);
+ appCtx.put(UimaAsynchronousEngine.GetMetaTimeout, 1100);
appCtx.put(UimaAsynchronousEngine.CpcTimeout, 1100);
initialize(uimaAsEngine, appCtx);
waitUntilInitialized();
@@ -283,7 +284,7 @@ public class TestUimaASExtended extends
}
CAS cas = uimaAsEngine.getCAS();
cas.setDocumentText("Some Text");
-// System.out.println("UIMA AS Client#"+
Thread.currentThread().getId()+" Sending CAS#"+(i + 1) + " Request to a
Service");
+ System.out.println("UIMA AS Client#"+
Thread.currentThread().getId()+" Sending CAS#"+(i + 1) + " Request to a
Service");
try {
uimaAsEngine.sendAndReceiveCAS(cas);
} catch( Exception e) {
@@ -292,7 +293,7 @@ public class TestUimaASExtended extends
cas.release();
}
synchronized(uimaAsEngine) {
- uimaAsEngine.wait(100);
+ uimaAsEngine.wait(50);
}
}
System.out.println("Thread:"+Thread.currentThread().getId()+"
Completed run()");
@@ -321,8 +322,10 @@ public class TestUimaASExtended extends
} catch ( Exception e ) {
} finally {
- for(int i=0; i < 4; i++ ) {
+ for(int i=0; i < clientThreads.length; i++ ) {
+ System.out.println(".... UIMA-AS
Client#"+clientThreads[i].getId()+" Waiting for completion");
clientThreads[i].join();
+ System.out.println(".... UIMA-AS Client#"+clientThreads[i].getId()+"
Completed");
}
System.out.println("Stopping Broker - wait ...");
if ( broker3 != null ) {
@@ -1660,7 +1663,7 @@ public class TestUimaASExtended extends
broker2.waitUntilStopped();
}
-
+/*
@Test
public void testAsyncClientRecoveryFromBrokerStopAndRestart() throws
Exception {
System.out.println("--------------
testAsyncClientRecoveryFromBrokerStopAndRestart -------------");
@@ -1686,8 +1689,8 @@ public class TestUimaASExtended extends
broker2.waitUntilStopped();
System.out.println("..... Stopped broker
............................");
Timer timer = new Timer();
- timer.schedule(new StartBrokerTask(broker2, this),500);
- delay = 200;
+ timer.schedule(new StartBrokerTask(broker2, this),2000);
+ delay = 5000;
}
synchronized(appCtx) {
try {
@@ -1696,16 +1699,16 @@ public class TestUimaASExtended extends
}
}
-/*
- } else if ( i == 15 ) {
- broker2 = setupSecondaryBroker(true);
- broker2.waitUntilStarted();
- System.out.println("..... Restarted broker
............................");
- }
+// } else if ( i == 15 ) {
+// broker2 = setupSecondaryBroker(true);
+// broker2.waitUntilStarted();
+// System.out.println("..... Restarted broker
............................");
+//
+// }
- */
+
CAS cas = uimaAsEngine.getCAS();
cas.setDocumentText("Some Text");
System.out.println("UIMA AS Client Sending CAS#" + (i + 1) + " Request
to a Service");
@@ -1720,7 +1723,7 @@ public class TestUimaASExtended extends
broker2.stop();
broker2.waitUntilStopped();
}
-
+*/
/**
* Tests recovery from a broker restart when running multiple instances of
* UIMA AS client in the same JVM. The scenario is:
@@ -2679,7 +2682,7 @@ private class Killer {
BaseUIMAAsynchronousEngine_impl eeUimaEngine = new
BaseUIMAAsynchronousEngine_impl();
System.setProperty(JmsConstants.SessionTimeoutOverride, "2500000");
deployService(eeUimaEngine, relativePath +
"/Deploy_NoOpAnnotatorWithLongDelay.xml");
- deployService(eeUimaEngine, relativePath + "/Deploy_NoOpAnnotator.xml");
+ deployService(eeUimaEngine, relativePath + "/Deploy_NoOpAnnotator.xml");
deployService(eeUimaEngine, relativePath +
"/Deploy_AggregateAnnotatorWithDelegateTimeoutAndContinueOnError.xml");
Map<String, Object> appCtx =
buildContext(String.valueOf(getMasterConnectorURI(broker)),"TopLevelTaeQueue");
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java?rev=1850368&r1=1850367&r2=1850368&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
(original)
+++
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
Fri Jan 4 14:35:07 2019
@@ -2019,7 +2019,11 @@ public abstract class BaseAnalysisEngine
if (this instanceof AggregateAnalysisEngineController_impl) {
((AggregateAnalysisEngineController_impl) this).cleanUp();
if (!((AggregateAnalysisEngineController_impl) this).initialized) {
- notifyListenersWithInitializationStatus(new
ResourceInitializationException());
+ if ( cause != null ) {
+ notifyListenersWithInitializationStatus(new
ResourceInitializationException(cause));
+ } else {
+ notifyListenersWithInitializationStatus(new
ResourceInitializationException());
+ }
}
}
if (statsMap != null) {
@@ -2171,6 +2175,9 @@ public abstract class BaseAnalysisEngine
terminate(null, null);
}
+ public void terminate(Throwable cause) {
+ terminate(cause, "NA");
+ }
public void terminate(Throwable cause, String aCasReferenceId) {
if (stopLatch.getCount() > 0) {
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/ControllerLifecycle.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/ControllerLifecycle.java?rev=1850368&r1=1850367&r2=1850368&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/ControllerLifecycle.java
(original)
+++
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/ControllerLifecycle.java
Fri Jan 4 14:35:07 2019
@@ -30,6 +30,11 @@ public interface ControllerLifecycle {
public void terminate();
/**
+ * Called to initiate shutdown of the Asynchronous Service. An
implementation can close an input
+ * and output channels and do any necessary cleanup before terminating.
+ */
+ public void terminate(Throwable cause);
+ /**
* Register one or more listeners through which the controller can send
notification of events.
*
*
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/UimacppServiceController.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/UimacppServiceController.java?rev=1850368&r1=1850367&r2=1850368&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/UimacppServiceController.java
(original)
+++
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/UimacppServiceController.java
Fri Jan 4 14:35:07 2019
@@ -742,7 +742,9 @@ public class UimacppServiceController ex
}
}
-
+ public void terminate(Throwable cause) {
+ terminate();
+ }
/**
*
* Runs when UIMA EE client API undeploys this service.
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java?rev=1850368&r1=1850367&r2=1850368&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java
(original)
+++
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java
Fri Jan 4 14:35:07 2019
@@ -101,7 +101,7 @@ public class GetMetaErrorHandler extends
"UIMAEE_terminate_service__INFO",
new Object[] { aController.getComponentName(),
endpoint.getEndpoint() });
}
- aController.terminate();
+ aController.terminate(t);
// Notify if the error occurred during initialization of the service.
// If the ping times out, there is no need to notify the listener. We
// use getMeta request as a ping to check if the service is running.
