avoid catching throwable
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ff372226 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ff372226 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ff372226 Branch: refs/heads/container-autoscaling Commit: ff3722268c5a9b5283c16958f66c0dc9e3b83095 Parents: 17073da Author: R-Rajkumar <[email protected]> Authored: Fri Oct 10 16:45:00 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Fri Oct 10 16:45:00 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/rule/RuleTasksDelegator.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ff372226/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 0a9bde3..1154ac3 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 @@ -32,6 +32,8 @@ import org.apache.stratos.autoscaler.algorithm.OneAfterAnother; import org.apache.stratos.autoscaler.algorithm.RoundRobin; import org.apache.stratos.autoscaler.client.cloud.controller.CloudControllerClient; import org.apache.stratos.autoscaler.client.cloud.controller.InstanceNotificationClient; +import org.apache.stratos.autoscaler.exception.SpawningException; +import org.apache.stratos.autoscaler.exception.TerminationException; import org.apache.stratos.autoscaler.partition.PartitionManager; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; @@ -227,7 +229,7 @@ public class RuleTasksDelegator { log.debug("Returned member context is null, did not add to pending members"); } } - } catch (Throwable e) { + } catch (Exception e) { log.error("Cannot create containers ", e); } } @@ -260,7 +262,7 @@ public class RuleTasksDelegator { log.debug("Returned array of member context is null, did not add to pending members"); } } - } catch (Throwable e) { + } catch (Exception e) { log.error("Cannot update kubernetes controller ", e); } } @@ -269,9 +271,9 @@ public class RuleTasksDelegator { try { CloudControllerClient ccClient = CloudControllerClient.getInstance(); ccClient.terminateContainer(memberId); - } catch (Throwable e) { + } catch (TerminationException e) { log.error("Cannot delete container ", e); - } + } } public int getPredictedReplicasForStat(int minReplicas, float statUpperLimit, float statPredictedValue) {
