xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2102 improve error handling on thrift or http errors

Browse source 
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: a7573825c6 [formerly f55b3cbdbe] [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c2faa0e3bf [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: 2c28ccce1da59ab7ab0b89fdd9a246a15d2ec710 [formerly 2200c7cded]
Former-commit-id: 4a39d586d2
This commit is contained in:
Nate Jensen 2013-06-12 16:16:11 -05:00
parent 7a196095cb
commit f173cc29e1
8 changed files with 72 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.uf.viz.product.alertviz/alertviz.product
View file

@ -31,7 +31,8 @@ Developed on the Raytheon Visualization Environment (viz)
-Dqpid.dest_syntax=BURL
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
-Dlog4j.configuration=log4j-alertviz.xml</vmArgs>
-Dlog4j.configuration=log4j-alertviz.xml
-Dthrift.stream.maxsize=200</vmArgs>
</launcherArgs>
<windowImages/>

3
cave/com.raytheon.viz.product.awips/awips.product
View file

@ -28,7 +28,8 @@
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
-XX:OnOutOfMemoryError=&quot;capture -t no -p $pid &amp;&quot;
-Dlog4j.configuration=log4j-viz-core.xml</vmArgs>
-Dlog4j.configuration=log4j-viz-core.xml
-Dthrift.stream.maxsize=200</vmArgs>
<vmArgsLin>-Xmx1280M</vmArgsLin>
<vmArgsWin>-Dfile.encoding=UTF-8 -Xmx768M</vmArgsWin>
</launcherArgs>

3
cave/com.raytheon.viz.product.awips/developer.product
View file

@ -24,7 +24,8 @@
-Dcom.sun.management.jmxremote
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
-Dlog4j.configuration=log4j-viz-core-developer.xml</vmArgs>
-Dlog4j.configuration=log4j-viz-core-developer.xml
-Dthrift.stream.maxsize=200</vmArgs>
<vmArgsWin>-Dfile.encoding=UTF-8</vmArgsWin>
</launcherArgs>

4
edexOsgi/build.edex/esb/conf/wrapper.conf
View file

@ -127,6 +127,10 @@ wrapper.java.additional.web.2=-Dconfidential.port=8443
# is removed from SerializationManager
wrapper.java.additional.misc.1=-DinitializeHibernatables=true
# the max size in MB of any stream sent to thrift, this prevents the OutOfMemory
# errors reported by thrift sometimes when the stream is corrupt/incorrect
wrapper.java.additional.thrift.maxStreamSize=-Dthrift.stream.maxsize=200
# enables yourkit profiling, determined by flag to start.sh
wrapper.java.additional.profile.1=${PROFILER_PARAM_1}

38
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
View file

@ -93,15 +93,17 @@ import com.raytheon.uf.common.util.ByteArrayOutputStreamPool.ByteArrayOutputStre
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 7/1/06 #1088 chammack Initial Creation.
* 5/17/10 #5901 njensen Moved to common
* 5/17/10 #5901 njensen Moved to common
* 03/02/11 #8045 rferrel Add connect reestablished message.
* 07/17/12 #911 njensen Refactored significantly
* 08/09/12 15307 snaples Added putEntitiy in postStreamingEntity.
* 01/07/13 DR 15294 D. Friedman Added streaming requests.
* Jan 24, 2013 1526 njensen Added postDynamicSerialize()
* 07/17/12 #911 njensen Refactored significantly
* 08/09/12 15307 snaples Added putEntitiy in postStreamingEntity.
* 01/07/13 DR 15294 D. Friedman Added streaming requests.
* Jan 24, 2013 1526 njensen Added postDynamicSerialize()
* Feb 20, 2013 1628 bsteffen clean up Inflaters used by
* HttpClient.
* HttpClient.
* Mar 11, 2013 1786 mpduff Add https capability.
* Jun 12, 2013 2102 njensen Better error handling when using
* DynamicSerializeStreamHandler
*
* </pre>
*
@ -641,6 +643,30 @@ public class HttpClient {
}
}
if (resp.getStatusLine().getStatusCode() != SUCCESS_CODE
&& handlerCallback instanceof DynamicSerializeStreamHandler) {
// the status code can be returned and/or processed
// depending on which post method and handlerCallback is used,
// so we only want to error off here if we're using a
// DynamicSerializeStreamHandler because deserializing will fail
// badly
String exceptionMsg = "HTTP server returned error code: "
+ resp.getStatusLine().getStatusCode();
DefaultInternalStreamHandler errorHandler = new DefaultInternalStreamHandler();
String serverErrorMsg = null;
try {
errorHandler.handleStream(resp.getEntity().getContent());
serverErrorMsg = new String(errorHandler.byteResult);
} catch (IOException e) {
statusHandler
.warn("Error reading the server's error message");
}
if (serverErrorMsg != null) {
exceptionMsg += "\n" + serverErrorMsg;
}
throw new CommunicationException(exceptionMsg);
}
// should only be able to get here if we didn't encounter the
// exceptions above on the most recent try
processResponse(resp, handlerCallback);

2
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/stream/DynamicSerializeStreamHandler.java
View file

@ -63,7 +63,7 @@ public class DynamicSerializeStreamHandler implements IStreamHandler {
SerializationType.Thrift).deserialize(is);
} catch (SerializationException e) {
throw new CommunicationException(
"Error deserializing streamed response");
"Error deserializing streamed response", e);
}
}

27
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/SelfDescribingBinaryProtocol.java
View file

@ -54,7 +54,9 @@ import com.facebook.thrift.transport.TTransport;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 7, 2008 chammack Initial creation
* Jun 17, 2010 #5091 njensen Added primitive list methods
* Jun 17, 2010 #5091 njensen Added primitive list methods
* Jun 12, 2013 2102 njensen Added max read length to prevent out
* of memory errors due to bad stream
*
* </pre>
*
@ -66,13 +68,34 @@ public class SelfDescribingBinaryProtocol extends TBinaryProtocol {
public static final byte FLOAT = 64;
/**
* This is to ensure a safety check because if the stream has bad bytes at
* the start, thrift may try to allocate something huge, such as GBs of
* data, and then the JVM will blow up about OutOfMemory errors.
**/
private static int MAX_READ_LENGTH;
static {
try {
int sizeInMB = Integer.parseInt(System
.getProperty("thrift.stream.maxsize"));
MAX_READ_LENGTH = sizeInMB * 1024 * 1024;
} catch (Throwable t) {
System.err
.println("Error reading property thrift.stream.maxsize - falling back to default of 200 MB");
t.printStackTrace();
MAX_READ_LENGTH = 200 * 1024 * 1024;
}
}
public SelfDescribingBinaryProtocol(TTransport trans) {
super(trans);
this(trans, false, true);
}
public SelfDescribingBinaryProtocol(TTransport trans, boolean strictRead,
boolean strictWrite) {
super(trans, strictRead, strictWrite);
this.setReadLength(MAX_READ_LENGTH);
}
/*

6
pythonPackages/pypies/pypies/handlers.py
View file

@ -30,7 +30,8 @@
# ------------ ---------- ----------- --------------------------
# 08/17/10 njensen Initial Creation.
# 01/11/13 bkowal Pypies will now read the hdf5 root from configuration
# 01/17/13 1490 bkowal Relocated the configuration of pypies
# 01/17/13 1490 bkowal Relocated the configuration of pypies
# 06/12/13 2102 njensen Raise uncaught exceptions to force http code 500
#
#
@ -111,7 +112,8 @@ def pypies_response(request):
except:
# Absolutely should not reach this, if we do, need to fix code
logger.error("Uncaught exception! " + IDataStore._exc())
return Response("Very bad uncaught exception, check pypies log")
# want to re-raise the error as that will cause PyPIES to return http error code 500
raise
def __prepareResponse(resp):