apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 12618 - Making usage data commands use their own socket instead of locking all activity to process data.

Browse Source
This commit is contained in:
Sam Robertson 2012-01-03 17:29:28 -08:00
parent 3843e08892
commit 3f35ce40ac
1 changed files with 63 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
core/src/com/cloud/network/resource/JuniperSrxResource.java
View File

@ -86,6 +86,8 @@ public class JuniperSrxResource implements ServerResource {
private String _objectNameWordSep;
private PrintWriter _toSrx;
private BufferedReader _fromSrx;
private PrintWriter _UsagetoSrx;
private BufferedReader _UsagefromSrx;
private static Integer _numRetries;
private static Integer _timeoutInSeconds;
private static String _publicZone;
@ -429,7 +431,7 @@ public class JuniperSrxResource implements ServerResource {
return new MaintainAnswer(cmd);
}
private synchronized ExternalNetworkResourceUsageAnswer execute(ExternalNetworkResourceUsageCommand cmd) {
private ExternalNetworkResourceUsageAnswer execute(ExternalNetworkResourceUsageCommand cmd) {
try {
return getUsageAnswer(cmd);
} catch (ExecutionException e) {
@ -492,6 +494,46 @@ public class JuniperSrxResource implements ServerResource {
}
}
/*
* The usage data will be handled on it's own socket, so usage
* commands will use the following methods...
*/
private boolean openUsageSocket() {
try {
Socket s = new Socket(_ip, 3221);
s.setKeepAlive(true);
s.setSoTimeout(_timeoutInSeconds * 1000);
_UsagetoSrx = new PrintWriter(s.getOutputStream(), true);
_UsagefromSrx = new BufferedReader(new InputStreamReader(s.getInputStream()));
return true;
} catch (IOException e) {
s_logger.error(e);
return false;
}
}
private boolean closeUsageSocket() {
try {
if (_UsagetoSrx != null) {
_UsagetoSrx.close();
}
if (_UsagefromSrx != null) {
_UsagefromSrx.close();
}
return true;
} catch (IOException e) {
s_logger.error(e);
return false;
}
}
private String sendUsageRequest(String xmlRequest) throws ExecutionException {
return sendRequestPrim(_UsagetoSrx, _UsagefromSrx, xmlRequest);
}
/*
* Commit/rollback
*/
@ -2735,10 +2777,16 @@ public class JuniperSrxResource implements ServerResource {
private ExternalNetworkResourceUsageAnswer getUsageAnswer(ExternalNetworkResourceUsageCommand cmd) throws ExecutionException {
try {
String socOpenException = "Failed to open a connection for Usage data.";
String socCloseException = "Unable to close connection for Usage data.";
if (!openUsageSocket()) {
throw new ExecutionException(socOpenException);
}
ExternalNetworkResourceUsageAnswer answer = new ExternalNetworkResourceUsageAnswer(cmd);
String xml = SrxXml.FIREWALL_FILTER_BYTES_GETALL.getXml();
String rawUsageData = sendRequest(xml);
String rawUsageData = sendUsageRequest(xml);
Document doc = getDocument(rawUsageData);
NodeList counters = doc.getElementsByTagName("counter");
@ -2768,10 +2816,13 @@ public class JuniperSrxResource implements ServerResource {
}
}
}
if (!closeUsageSocket()) {
throw new ExecutionException(socCloseException);
}
return answer;
} catch (Exception e) {
throw new ExecutionException(e.getMessage());
closeUsageSocket();
throw new ExecutionException(e.getMessage());
}
}
@ -2856,7 +2907,7 @@ public class JuniperSrxResource implements ServerResource {
* XML API commands
*/
private String sendRequest(String xmlRequest) throws ExecutionException {
private String sendRequestPrim(PrintWriter sendStream, BufferedReader recvStream, String xmlRequest) throws ExecutionException {
if (!xmlRequest.contains("request-login")) {
s_logger.debug("Sending request: " + xmlRequest);
} else {
@ -2866,11 +2917,11 @@ public class JuniperSrxResource implements ServerResource {
boolean timedOut = false;
StringBuffer xmlResponseBuffer = new StringBuffer("");
try {
_toSrx.write(xmlRequest);
_toSrx.flush();
sendStream.write(xmlRequest);
sendStream.flush();
String line = "";
while ((line = _fromSrx.readLine()) != null) {
while ((line = recvStream.readLine()) != null) {
xmlResponseBuffer.append(line);
if (line.contains("</rpc-reply>")) {
break;
@ -2905,6 +2956,10 @@ public class JuniperSrxResource implements ServerResource {
throw new ExecutionException(errorMsg);
}
}
private String sendRequest(String xmlRequest) throws ExecutionException {
return sendRequestPrim(_toSrx, _fromSrx, xmlRequest);
}
private boolean checkResponse(String xmlResponse, boolean errorKeyAndValue, String key, String value) {
if (!xmlResponse.contains("authentication-response")) {