Commit 5b580630 authored by Spiros Koulouzis's avatar Spiros Koulouzis

Added logging messages

parent 7f3ee619
...@@ -57,6 +57,7 @@ import provisioning.database.EC2.EC2Database; ...@@ -57,6 +57,7 @@ import provisioning.database.EC2.EC2Database;
import provisioning.database.EGI.EGIDatabase; import provisioning.database.EGI.EGIDatabase;
import provisioning.database.UserDatabase; import provisioning.database.UserDatabase;
import provisioning.engine.TEngine.TEngine; import provisioning.engine.TEngine.TEngine;
import provisioning.request.RecoverRequest;
import provisioning.request.ScalingRequest; import provisioning.request.ScalingRequest;
import topologyAnalysis.TopologyAnalysisMain; import topologyAnalysis.TopologyAnalysisMain;
import topologyAnalysis.dataStructure.SubTopologyInfo; import topologyAnalysis.dataStructure.SubTopologyInfo;
...@@ -215,6 +216,9 @@ public class Consumer extends DefaultConsumer { ...@@ -215,6 +216,9 @@ public class Consumer extends DefaultConsumer {
if (tam != null) { if (tam != null) {
tEngine.deleteAll(tam.wholeTopology, userCredential, userDatabase); tEngine.deleteAll(tam.wholeTopology, userCredential, userDatabase);
} }
if (ex.getMessage().equals("A VM failed to start. Deleteing all topology")) {
}
throw ex; throw ex;
} finally { } finally {
// if (tam != null) { // if (tam != null) {
...@@ -486,7 +490,7 @@ public class Consumer extends DefaultConsumer { ...@@ -486,7 +490,7 @@ public class Consumer extends DefaultConsumer {
} }
private Message buildTopologuResponse(TopologyAnalysisMain tam, private Message buildTopologuResponse(TopologyAnalysisMain tam,
String tempInputDirPath, String userPublicKeyName, String userPrivateName) throws IOException { String tempInputDirPath, String userPublicKeyName, String userPrivateName) throws IOException, Exception {
String topologyUserName = tam.wholeTopology.userName; String topologyUserName = tam.wholeTopology.userName;
String charset = "UTF-8"; String charset = "UTF-8";
...@@ -619,6 +623,8 @@ public class Consumer extends DefaultConsumer { ...@@ -619,6 +623,8 @@ public class Consumer extends DefaultConsumer {
paramValue += sub.userName + " "; paramValue += sub.userName + " ";
// paramValue += tempInputDirPath + File.separator + sub.subTopology.accessKeyPair.SSHKeyPairId + File.separator + "id_rsa"; // paramValue += tempInputDirPath + File.separator + sub.subTopology.accessKeyPair.SSHKeyPairId + File.separator + "id_rsa";
paramValue += vm.role + "\n"; paramValue += vm.role + "\n";
} else if (vm == null || !sub.status.equals("running")) {
throw new Exception("A VM failed to start. Deleteing all topology");
} }
} }
// String accessKeyPath = tempInputDirPath + File.separator + sub.subTopology.accessKeyPair.SSHKeyPairId + File.separator + "id_rsa"; // String accessKeyPath = tempInputDirPath + File.separator + sub.subTopology.accessKeyPair.SSHKeyPairId + File.separator + "id_rsa";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment