You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/12/18 11:07:41 UTC
[1/2] git commit: Add fault member for lb members
Updated Branches:
refs/heads/master c481e02ac -> 47a5f65ba
Add fault member for lb members
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/53924a94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/53924a94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/53924a94
Branch: refs/heads/master
Commit: 53924a942270272d3e42fef85ba1c558fa91bfb2
Parents: 2bc47a0
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Dec 18 15:36:06 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Dec 18 15:36:06 2013 -0500
----------------------------------------------------------------------
.../apache/stratos/autoscaler/AutoscalerContext.java | 4 ++++
.../receiver/health/HealthEventMessageDelegator.java | 15 +++++++++------
.../stratos/autoscaler/monitor/AbstractMonitor.java | 1 -
3 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/53924a94/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java
index fffc8c3..b8111d7 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java
@@ -51,6 +51,10 @@ public class AutoscalerContext {
return monitors.containsKey(clusterId);
}
+ public boolean lbMoniterExist(String clusterId) {
+ return lbMonitors.containsKey(clusterId);
+ }
+
public LbClusterMonitor getLBMonitor(String clusterId) {
return lbMonitors.get(clusterId);
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/53924a94/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
index d206590..e32c4ad 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
@@ -30,8 +30,6 @@ import org.apache.stratos.autoscaler.client.cloud.controller.CloudControllerClie
import org.apache.stratos.autoscaler.exception.SpawningException;
import org.apache.stratos.autoscaler.exception.TerminationException;
import org.apache.stratos.autoscaler.monitor.AbstractMonitor;
-import org.apache.stratos.autoscaler.monitor.ClusterMonitor;
-import org.apache.stratos.autoscaler.partition.PartitionManager;
import org.apache.stratos.autoscaler.policy.model.LoadAverage;
import org.apache.stratos.autoscaler.policy.model.MemoryConsumption;
import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator;
@@ -321,10 +319,15 @@ public class HealthEventMessageDelegator implements Runnable {
AutoscalerContext asCtx = AutoscalerContext.getInstance();
AbstractMonitor monitor = null;
- if(asCtx.moniterExist(clusterId)){
- monitor = AutoscalerContext.getInstance().getMonitor(clusterId);
- }
-
+ if(asCtx.moniterExist(clusterId)){
+ monitor = asCtx.getMonitor(clusterId);
+ }else if(asCtx.lbMoniterExist(clusterId)){
+ monitor = asCtx.getLBMonitor(clusterId);
+ }else{
+ String errMsg = "A monitor is not found for this custer";
+ log.error(errMsg);
+ throw new RuntimeException(errMsg);
+ }
if (!monitor.memberExist(memberId)) {
// member has already terminated. So no action required
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/53924a94/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractMonitor.java
index b0ac576..763f7e9 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractMonitor.java
@@ -20,7 +20,6 @@ package org.apache.stratos.autoscaler.monitor;
import org.apache.stratos.autoscaler.NetworkPartitionContext;
import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
-import org.apache.stratos.cloud.controller.deployment.partition.Partition;
/**
* Is responsible for monitoring a service cluster. This runs periodically
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/47a5f65b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/47a5f65b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/47a5f65b
Branch: refs/heads/master
Commit: 47a5f65bac766448b8bee73671472b4f570b18e1
Parents: 53924a9 c481e02
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Dec 18 15:36:41 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Dec 18 15:36:41 2013 -0500
----------------------------------------------------------------------
.../autoscaler/TestObsoletedMemberRule.java | 7 +-
.../org/apache/stratos/cli/AutoscalePolicy.java | 52 -----
.../java/org/apache/stratos/cli/Cartridge.java | 201 -------------------
.../apache/stratos/cli/CartridgeInfoBean.java | 124 ------------
.../apache/stratos/cli/DeploymentPolicy.java | 31 ---
.../java/org/apache/stratos/cli/Partition.java | 76 -------
.../org/apache/stratos/cli/PropertyBean.java | 42 ----
.../stratos/cli/RestCommandLineService.java | 1 +
.../apache/stratos/cli/StratosApplication.java | 7 +-
.../apache/stratos/cli/SubscriptionInfo.java | 44 ----
.../org/apache/stratos/cli/TenantInfoBean.java | 85 --------
.../stratos/cli/beans/AutoscalePolicy.java | 52 +++++
.../org/apache/stratos/cli/beans/Cartridge.java | 201 +++++++++++++++++++
.../stratos/cli/beans/CartridgeInfoBean.java | 124 ++++++++++++
.../stratos/cli/beans/DeploymentPolicy.java | 31 +++
.../org/apache/stratos/cli/beans/Partition.java | 76 +++++++
.../apache/stratos/cli/beans/PropertyBean.java | 42 ++++
.../stratos/cli/beans/SubscriptionInfo.java | 44 ++++
.../stratos/cli/beans/TenantInfoBean.java | 85 ++++++++
.../conf/configurator/SynapseConfigurator.java | 6 +-
.../TopologyFilterConfigurator.java | 26 ++-
.../internal/LoadBalancerServiceComponent.java | 4 +
22 files changed, 685 insertions(+), 676 deletions(-)
----------------------------------------------------------------------