Repository: stratos Updated Branches: refs/heads/master 11ee9e2b1 -> 32ec7a8ed
Removing Throwable catch statements in RuleTaskDelegator and replacing them with Exception Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/32ec7a8e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/32ec7a8e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/32ec7a8e Branch: refs/heads/master Commit: 32ec7a8ed3402c45f546ed8cb926b9383c2d1300 Parents: 11ee9e2 Author: Imesh Gunaratne <[email protected]> Authored: Sun Jan 25 00:17:43 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sun Jan 25 00:19:50 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/rule/RuleTasksDelegator.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/32ec7a8e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java index e90a17b..68f06e4 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java @@ -35,6 +35,7 @@ import org.apache.stratos.autoscaler.context.member.MemberStatsContext; import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext; import org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext; import org.apache.stratos.autoscaler.event.publisher.InstanceNotificationPublisher; +import org.apache.stratos.autoscaler.exception.cartridge.TerminationException; import org.apache.stratos.autoscaler.monitor.cluster.ClusterMonitor; import org.apache.stratos.cloud.controller.stub.domain.MemberContext; @@ -158,7 +159,7 @@ public class RuleTasksDelegator { InstanceNotificationPublisher.getInstance().sendInstanceCleanupEventForMember(memberId); log.info("Instance clean up event sent for [member] " + memberId); - } catch (Throwable e) { + } catch (Exception e) { log.error("Cannot terminate instance", e); } } @@ -207,7 +208,7 @@ public class RuleTasksDelegator { log.error("Member context returned from cloud controller is null"); } } - } catch (Throwable e) { + } catch (Exception e) { String message = String.format("Could not start instance: [cluster-id] %s [instance-id] %s", clusterId, clusterInstanceId); log.error(message, e); @@ -269,7 +270,7 @@ public class RuleTasksDelegator { } else if (clusterMonitorPartitionContext.pendingMemberAvailable(memberId)) { clusterMonitorPartitionContext.movePendingMemberToObsoleteMembers(memberId); } - } catch (Throwable e) { + } catch (Exception e) { log.error("Cannot terminate instance", e); } } @@ -283,7 +284,7 @@ public class RuleTasksDelegator { //InstanceNotificationClient.getInstance().sendMemberCleanupEvent(memberId); //partitionContext.moveActiveMemberToTerminationPendingMembers(memberId); //CloudControllerClient.getInstance().terminate(memberId); - } catch (Throwable e) { + } catch (Exception e) { log.error("Cannot terminate instance", e); } } @@ -291,7 +292,9 @@ public class RuleTasksDelegator { public void terminateObsoleteInstance(String memberId) { try { CloudControllerClient.getInstance().terminateInstance(memberId); - } catch (Throwable e) { + } catch (Exception e) { + log.error("Cannot terminate instance", e); + } catch (TerminationException e) { log.error("Cannot terminate instance", e); } } @@ -306,7 +309,9 @@ public class RuleTasksDelegator { if (log.isDebugEnabled()) { log.debug("delegateTerminateAll - done"); } - } catch (Throwable e) { + } catch (Exception e) { + log.error("Cannot terminate instance", e); + } catch (TerminationException e) { log.error("Cannot terminate instance", e); } }
