You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2017/01/18 23:13:55 UTC
svn commit: r1779400 -
/uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
Author: burn
Date: Wed Jan 18 23:13:55 2017
New Revision: 1779400
URL: http://svn.apache.org/viewvc?rev=1779400&view=rev
Log:
UIMA-5244 Back out fix. SM relies on this 'feature' when restarting after a full bounce
Modified:
uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
Modified: uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java?rev=1779400&r1=1779399&r2=1779400&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java Wed Jan 18 23:13:55 2017
@@ -1355,8 +1355,12 @@ public class ServiceSet
{
// UIMA-4587 & UIMA-5244
String methodName="needNextStart";
- if ( isDeregistered() || !enabled() ) {
- logger.info(methodName, id, "Bypassing instance start because service is unregistered or disabled.");
+ // Can't do this before we handle the OR publication of "defunct" instances that were running when DUCC was shutdown
+ // They should not be counted as errors when the SM restarts.
+ /* if ( isDeregistered() || !enabled() ) {
+ logger.info(methodName, id, "Bypassing instance start because service is unregistered or disabled.");*/
+ if ( isDeregistered() ) {
+ logger.info(methodName, id, "Bypassing instance start because service is unregistered.");
return false;
}
@@ -2123,8 +2127,11 @@ public class ServiceSet
String methodName = "start";
// UIMA-4587 & UIMA-5244
- if ( isDeregistered() || !enabled()) {
- logger.info(methodName, id, "Bypass start becuase service is unregistered or disabled.");
+ // Can't do this yet
+/* if ( isDeregistered() || !enabled()) {
+ logger.info(methodName, id, "Bypass start because service is unregistered or disabled.");*/
+ if ( isDeregistered()) {
+ logger.info(methodName, id, "Bypass start because service is unregistered.");
return;
}