You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/03/14 16:46:58 UTC
svn commit: r1786924 - in /qpid/java/branches/6.1.x: ./
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/
broker-core/src/main/java/org/apache/qpid/server/util/
broker-plugins/management-http/src/main/java/org/apache/qpid/serv...
Author: kwall
Date: Tue Mar 14 16:46:58 2017
New Revision: 1786924
URL: http://svn.apache.org/viewvc?rev=1786924&view=rev
Log:
QPID-7675: [BDB HA] Report failure to connect to a peer node during group creation is reported as SC_BAD_GATEWAY
Merged with commands:
svn merge -c 1785854 ^/qpid/java/trunk
svn merge -c 1785936 ^/qpid/java/trunk
svn merge -c 1786188 ^/qpid/java/trunk
Added:
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/util/ExternalServiceTimeoutException.java
- copied unchanged from r1786188, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ExternalServiceTimeoutException.java
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 14 16:46:58 2017
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117,1785158,1785269-1785270,1785311,1785675,1785679,1785854,1785936,1786690
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117,1785158,1785269-1785270,1785311,1785675,1785679,1785854,1785936,1786188,1786690
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java?rev=1786924&r1=1786923&r2=1786924&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java (original)
+++ qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java Tue Mar 14 16:46:58 2017
@@ -24,6 +24,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.net.InetSocketAddress;
+import java.net.SocketTimeoutException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -79,6 +80,7 @@ import org.apache.qpid.server.store.berk
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.DaemonThreadFactory;
import org.apache.qpid.server.util.ExternalServiceException;
+import org.apache.qpid.server.util.ExternalServiceTimeoutException;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChangeListener
@@ -1847,6 +1849,11 @@ public class ReplicatedEnvironmentFacade
byte[] applicationState = state.getAppState();
permittedNodes = convertApplicationStateBytesToPermittedNodeList(applicationState);
}
+ catch (SocketTimeoutException ste)
+ {
+ throw new ExternalServiceTimeoutException(String.format("Timed out trying to connect to existing node '%s' at '%s'",
+ helperNodeName, helperHostPort), ste);
+ }
catch (IOException | ServiceConnectFailedException e)
{
throw new ExternalServiceException(String.format("Cannot connect to existing node '%s' at '%s'",
Modified: qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1786924&r1=1786923&r2=1786924&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java (original)
+++ qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java Tue Mar 14 16:46:58 2017
@@ -64,6 +64,7 @@ import org.apache.qpid.server.model.Inte
import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.OperationTimeoutException;
import org.apache.qpid.server.model.preferences.UserPreferences;
+import org.apache.qpid.server.util.ExternalServiceTimeoutException;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
import org.apache.qpid.util.DataUrlUtils;
@@ -1170,9 +1171,15 @@ public class RestServlet extends Abstrac
message = "Not found: " + message;
LOGGER.warn("Unexpected exception processing request ", e);
}
+ else if (e instanceof ExternalServiceTimeoutException)
+ {
+ responseCode = HttpServletResponse.SC_GATEWAY_TIMEOUT;
+ LOGGER.warn("External request timeout ", e);
+ }
else if (e instanceof ExternalServiceException)
{
responseCode = HttpServletResponse.SC_BAD_GATEWAY;
+ LOGGER.warn("External request failed ", e);
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org