Author: degenaro
Date: Wed Jun 22 18:27:34 2016
New Revision: 1749752
URL: http://svn.apache.org/viewvc?rev=1749752&view=rev
Log:
UIMA-4964 DUCC Web Server (WS) improved test for DB aliveness
Modified:
uima/uima-ducc/trunk/src/main/resources/default.ducc.properties
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java
uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/DuccEvent.java
Modified: uima/uima-ducc/trunk/src/main/resources/default.ducc.properties
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/resources/default.ducc.properties?rev=1749752&r1=1749751&r2=1749752&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/resources/default.ducc.properties (original)
+++ uima/uima-ducc/trunk/src/main/resources/default.ducc.properties Wed Jun 22
18:27:34 2016
@@ -177,6 +177,14 @@ ducc.signature.required=on
# ========== Web Server Configuration block ==========
ducc.ws.configuration.class=org.apache.uima.ducc.ws.config.WebServerConfiguration
+
+# This endpoint is used for webserver self test to determine viability of
broker.
+# After 3 missed messages to self via broker, webserver considers broker to be
down.
+ducc.ws.state.update.endpoint=ducc.ws.state
+# endpoint type choices[topic]
+ducc.ws.state.update.endpoint.type=topic
+ducc.ws.state.publish.rate=5000
+
# Optionally configure the webserver to run on a non-head node
# ducc.ws.node = my.node.com
# Optionally configure the webserver IP address
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java?rev=1749752&r1=1749751&r2=1749752&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java
Wed Jun 22 18:27:34 2016
@@ -98,6 +98,14 @@ public class CommonConfiguration {
@Value("#{ systemProperties['ducc.orchestrator.state.publish.rate'] }")
public String orchestratorStatePublishRate;
+ // fetch the name of an endpoint where the Web Server should post
state updates
+ @Value("#{ systemProperties['ducc.ws.state.update.endpoint'] }")
+ public String wsStateUpdateEndpoint;
+
+ // fetch the rate at which the Web Server should post its state
+ @Value("#{ systemProperties['ducc.ws.state.publish.rate'] }")
+ public String wsStatePublishRate;
+
// fetch the name of an endpoint where the Job Driver should post
state updates
@Value("#{ systemProperties['ducc.jd.state.update.endpoint'] }")
public String jdStateUpdateEndpoint;
Modified:
uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex?rev=1749752&r1=1749751&r2=1749752&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
(original)
+++
uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
Wed Jun 22 18:27:34 2016
@@ -634,6 +634,30 @@
\item[Type] Tuning
\end{description}
+ \item[ducc.ws.state.update.endpoint] \hfill \\
+ This is the name of the JMS endpoint through which the Webserver
broadcasts its state messages.
+ These messages are broadcast to self to determine viability of the
broker.
+ \begin{description}
+ \item[Default Value] ducc.ws.request
+ \item[Type] Private
+ \end{description}
+
+ \item[ducc.ws.state.update.endpoint.type] \hfill \\
+ This is the JMS endpoint type used for the state messages sent by the
Webserver.
+ \begin{description}
+ \item[Default Value] topic
+ \item[Type] Private
+ \end{description}
+
+ \item[ducc.ws.state.publish.rate] \hfill \\
+ \phantomsection\label{itm:props-ws.state.publish.rate}
+
+ The interval in milliseconds between Webserver publications of its
state.
+ \begin{description}
+ \item[Default Value] 5000
+ \item[Type] Private
+ \end{description}
+
\end{description}
@@ -925,7 +949,7 @@
state messages. These messages include full job information and can be
large. This state is
used by the Process Manager and the Webserver.
\begin{description}
- \item[Default Value] ducc.orchestrator.request?requestTimeout=180000
+ \item[Default Value] ducc.orchestrator.request
\item[Type] Private
\end{description}
Modified:
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/DuccEvent.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/DuccEvent.java?rev=1749752&r1=1749751&r2=1749752&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/DuccEvent.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/DuccEvent.java
Wed Jun 22 18:27:34 2016
@@ -36,6 +36,7 @@ public interface DuccEvent extends Seria
SERVICE_REPLY,
START_PROCESS,
STOP_PROCESS,
+ WEBSERVER_STATE,
JD_STATE,
ORCHESTRATOR_STATE,
RM_STATE,
