You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/09/10 08:34:11 UTC
[2/5] stratos git commit: Adding general exception catch block
Adding general exception catch block
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6be6f794
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6be6f794
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6be6f794
Branch: refs/heads/stratos-4.1.x
Commit: 6be6f794a6c364f2bc3c906134e7c6f0feab9591
Parents: 213afdd
Author: anuruddhal <an...@gmail.com>
Authored: Mon Sep 7 11:43:44 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Mon Sep 7 11:43:44 2015 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/util/AutoscalerUtil.java | 75 ++++++++++----------
1 file changed, 38 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6be6f794/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index 08af34a..b717853 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -968,51 +968,52 @@ public class AutoscalerUtil {
int retries = 5;
boolean success = false;
ApplicationMonitor applicationMonitor = null;
- while (!success && retries != 0) {
+ try {
+ while (!success && retries != 0) {
- try {
- startTime = System.currentTimeMillis();
- log.info("Starting monitor: [application] " + applicationId);
try {
- applicationMonitor = MonitorFactory.getApplicationMonitor(applicationId);
- } catch (PolicyValidationException e) {
+ startTime = System.currentTimeMillis();
+ log.info("Starting monitor: [application] " + applicationId);
+ try {
+ applicationMonitor = MonitorFactory.getApplicationMonitor(applicationId);
+ } catch (PolicyValidationException e) {
+ String msg = "Monitor creation failed: [application] " + applicationId;
+ log.warn(msg, e);
+ retries--;
+ }
+ success = true;
+ endTime = System.currentTimeMillis();
+ } catch (DependencyBuilderException e) {
+ String msg = "Monitor creation failed: [application] " + applicationId;
+ log.warn(msg, e);
+ retries--;
+ } catch (TopologyInConsistentException e) {
String msg = "Monitor creation failed: [application] " + applicationId;
log.warn(msg, e);
retries--;
}
- success = true;
- endTime = System.currentTimeMillis();
- } catch (DependencyBuilderException e) {
- String msg = "Monitor creation failed: [application] " + applicationId;
- log.warn(msg, e);
- retries--;
- } catch (TopologyInConsistentException e) {
- String msg = "Monitor creation failed: [application] " + applicationId;
- log.warn(msg, e);
- retries--;
- } catch (Exception e) {
- String msg = "Monitor creation failed: [application] " + applicationId;
- log.warn(msg, e);
- retries--;
}
- }
- if (applicationMonitor == null) {
- String msg = "Monitor creation failed, even after retrying for 5 times: "
- + "[application] " + applicationId;
- log.error(msg);
- throw new RuntimeException(msg);
- }
- AutoscalerContext autoscalerContext = AutoscalerContext.getInstance();
- autoscalerContext.removeApplicationPendingMonitor(applicationId);
- autoscalerContext.removeAppMonitor(applicationId);
- autoscalerContext.addAppMonitor(applicationMonitor);
-
- long startupTime = ((endTime - startTime) / 1000);
- if (log.isInfoEnabled()) {
- log.info(String.format("Monitor started successfully: [application] %s [dependents] %s " +
- "[startup-time] %d seconds", applicationMonitor.getId(),
- applicationMonitor.getStartupDependencyTree(), startupTime));
+ if (applicationMonitor == null) {
+ String msg = "Monitor creation failed, even after retrying for 5 times: "
+ + "[application] " + applicationId;
+ log.error(msg);
+ throw new RuntimeException(msg);
+ }
+ AutoscalerContext autoscalerContext = AutoscalerContext.getInstance();
+ autoscalerContext.removeApplicationPendingMonitor(applicationId);
+ autoscalerContext.removeAppMonitor(applicationId);
+ autoscalerContext.addAppMonitor(applicationMonitor);
+
+ long startupTime = ((endTime - startTime) / 1000);
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Monitor started successfully: [application] %s [dependents] %s " +
+ "[startup-time] %d seconds", applicationMonitor.getId(),
+ applicationMonitor.getStartupDependencyTree(), startupTime));
+ }
+ } catch (Exception e){
+ String msg = "Monitor creation failed: [application] " + applicationId;
+ log.error(msg, e);
}
}
}