Updated Branches: refs/heads/master b695c540a -> 8cdcfd55f
fixing the log message and cleaning up Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8cdcfd55 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8cdcfd55 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8cdcfd55 Branch: refs/heads/master Commit: 8cdcfd55fe355f041fb220dc206871f97b5269a8 Parents: b695c54 Author: Nirmal Fernando <[email protected]> Authored: Mon Dec 16 11:01:37 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Mon Dec 16 11:01:37 2013 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 43 ++------------------ 1 file changed, 3 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cdcfd55/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index a8a1b68..cb7abb0 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -621,44 +621,9 @@ public class CloudControllerServiceImpl implements CloudControllerService { log.error(msg); throw new InvalidMemberException(msg); } - // ServiceContext serviceCtxt = dataHolder - // .getServiceContextFromDomain(clusterId); - // - // if (serviceCtxt == null) { - // String msg = "Not a registered service: domain - " + clusterId; - // log.fatal(msg); - // throw new CloudControllerException(msg); - // } - // - // // load Cartridge, if null - // //if (serviceCtxt.getCartridge() == null) { - // serviceCtxt.setCartridge(loadCartridge( - // serviceCtxt.getCartridgeType(), - // dataHolder.getCartridges())); - // //} - // - // // if still, Cartridge is null - // if (serviceCtxt.getCartridge() == null) { - // String msg = "There's no registered Cartridge found. Domain - " - // + clusterId; - // log.fatal(msg); - // throw new CloudControllerException(msg); - // } - - // for (IaasProvider iaas : serviceCtxt.getCartridge().getIaases()) { IaasProvider iaasProvider = cartridge.getIaasProviderOfPartition(partitionId); - - - // // terminate the last instance first - // for (String id : Lists.reverse(ctxt.getNodeIds())) { - // if (id != null) { - // nodeId = id; - // break; - // } - // } - // terminate it! terminate(iaasProvider, nodeId, ctxt); @@ -667,11 +632,9 @@ public class CloudControllerServiceImpl implements CloudControllerService { } catch (Exception e) { String msg = - "Starting to terminate an instance with member id : " + memberId + - " in partition id: " + partitionId + " of cluster id: " + - clusterId + " and of cartridge type: " + cartridgeType; - log.error(msg); - throw new CloudControllerException(msg); + "Instance termination failed. "+ctxt.toString(); + log.error(msg, e); + throw new CloudControllerException(msg, e); } }
