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/05/05 09:13:47 UTC
[2/3] stratos git commit: Upadet autoscaler service and other classes
to hangle specific errors
Upadet autoscaler service and other classes to hangle specific errors
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0059525d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0059525d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0059525d
Branch: refs/heads/master
Commit: 0059525d499f08134fe128cd3370bfb10e244617
Parents: dff5eb1
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue May 5 12:14:57 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue May 5 12:14:57 2015 +0530
----------------------------------------------------------------------
.../exception/CartridgeGroupNotFoundException.java | 2 +-
.../autoscaler/internal/AutoscalerServiceComponent.java | 3 ++-
.../stratos/autoscaler/services/AutoscalerService.java | 9 ++++-----
.../autoscaler/services/impl/AutoscalerServiceImpl.java | 11 +++++------
4 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0059525d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/CartridgeGroupNotFoundException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/CartridgeGroupNotFoundException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/CartridgeGroupNotFoundException.java
index f90fb39..b32fe26 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/CartridgeGroupNotFoundException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/CartridgeGroupNotFoundException.java
@@ -1,6 +1,6 @@
package org.apache.stratos.autoscaler.exception;
-public class CartridgeGroupNotFoundException extends AutoScalerException {
+public class CartridgeGroupNotFoundException extends Exception {
public CartridgeGroupNotFoundException(String msg) {
super(msg);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0059525d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
index 10fd07d..c9d9f4e 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
@@ -28,6 +28,7 @@ import org.apache.stratos.autoscaler.context.AutoscalerContext;
import org.apache.stratos.autoscaler.event.receiver.health.AutoscalerHealthStatEventReceiver;
import org.apache.stratos.autoscaler.event.receiver.topology.AutoscalerTopologyEventReceiver;
import org.apache.stratos.autoscaler.exception.AutoScalerException;
+import org.apache.stratos.autoscaler.exception.AutoScalingPolicyAlreadyExistException;
import org.apache.stratos.autoscaler.exception.application.InvalidApplicationPolicyException;
import org.apache.stratos.autoscaler.exception.policy.InvalidDeploymentPolicyException;
import org.apache.stratos.autoscaler.exception.policy.InvalidPolicyException;
@@ -153,7 +154,7 @@ public class AutoscalerServiceComponent {
}
private void executeCoordinatorTasks() throws InvalidPolicyException,
- InvalidDeploymentPolicyException, InvalidApplicationPolicyException {
+ InvalidDeploymentPolicyException, InvalidApplicationPolicyException, AutoScalingPolicyAlreadyExistException {
// Start topology receiver
asTopologyReceiver = new AutoscalerTopologyEventReceiver();
http://git-wip-us.apache.org/repos/asf/stratos/blob/0059525d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
index 2794ef3..76e7e8e 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
@@ -22,9 +22,7 @@
package org.apache.stratos.autoscaler.services;
import org.apache.stratos.autoscaler.applications.pojo.ApplicationContext;
-import org.apache.stratos.autoscaler.exception.AutoScalerException;
-import org.apache.stratos.autoscaler.exception.CloudControllerConnectionException;
-import org.apache.stratos.autoscaler.exception.InvalidArgumentException;
+import org.apache.stratos.autoscaler.exception.*;
import org.apache.stratos.autoscaler.exception.application.ApplicationDefinitionException;
import org.apache.stratos.autoscaler.exception.application.InvalidApplicationPolicyException;
import org.apache.stratos.autoscaler.exception.application.InvalidServiceGroupException;
@@ -45,7 +43,8 @@ public interface AutoscalerService {
* @return
* @throws InvalidPolicyException
*/
- public boolean addAutoScalingPolicy(AutoscalePolicy autoscalePolicy) throws InvalidPolicyException;
+ public boolean addAutoScalingPolicy(AutoscalePolicy autoscalePolicy) throws InvalidPolicyException,
+ AutoScalingPolicyAlreadyExistException;
/**
* Get an autoscaling policy
@@ -207,7 +206,7 @@ public interface AutoscalerService {
*
* @param groupName
*/
- public void removeServiceGroup(String groupName);
+ public void removeServiceGroup(String groupName) throws CartridgeGroupNotFoundException;
/**
* Get cartridge group
http://git-wip-us.apache.org/repos/asf/stratos/blob/0059525d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
index 527057b..9a77161 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
@@ -32,10 +32,7 @@ import org.apache.stratos.autoscaler.context.InstanceContext;
import org.apache.stratos.autoscaler.context.cluster.ClusterInstanceContext;
import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext;
import org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext;
-import org.apache.stratos.autoscaler.exception.AutoScalerException;
-import org.apache.stratos.autoscaler.exception.AutoScalingPolicyAlreadyExistException;
-import org.apache.stratos.autoscaler.exception.CloudControllerConnectionException;
-import org.apache.stratos.autoscaler.exception.InvalidArgumentException;
+import org.apache.stratos.autoscaler.exception.*;
import org.apache.stratos.autoscaler.exception.application.ApplicationDefinitionException;
import org.apache.stratos.autoscaler.exception.application.InvalidApplicationPolicyException;
import org.apache.stratos.autoscaler.exception.application.InvalidServiceGroupException;
@@ -645,7 +642,7 @@ public class AutoscalerServiceImpl implements AutoscalerService {
}
@Override
- public void removeServiceGroup(String groupName) {
+ public void removeServiceGroup(String groupName) throws CartridgeGroupNotFoundException {
try {
if (log.isInfoEnabled()) {
log.info(String.format("Starting to remove cartridge group: [group-name] %s", groupName));
@@ -656,9 +653,11 @@ public class AutoscalerServiceImpl implements AutoscalerService {
log.info(String.format("Cartridge group removed: [group-name] %s", groupName));
}
} else {
+ String msg = String.format("Cartridge group not found: [group-name] %s", groupName);
if (log.isWarnEnabled()) {
- log.warn(String.format("Cartridge group not found: [group-name] %s", groupName));
+ log.warn(msg);
}
+ throw new CartridgeGroupNotFoundException(msg);
}
} catch (org.wso2.carbon.registry.core.exceptions.RegistryException e) {
String message = "Could not remove cartridge group: " + groupName;