You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2013/12/11 19:10:36 UTC
[1/2] git commit: merge conflict
Updated Branches:
refs/heads/master 75d977eb3 -> 7732f1350
merge conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/34d04696
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/34d04696
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/34d04696
Branch: refs/heads/master
Commit: 34d04696e9f860e9559b0a88ffc8fce5efccfe4f
Parents: 75d977e
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Dec 11 23:40:06 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Dec 11 23:40:06 2013 +0530
----------------------------------------------------------------------
.../message/receiver/health/HealthEventMessageDelegator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34d04696/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 f7fc6b1..76dac5d 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
@@ -282,7 +282,7 @@ public class HealthEventMessageDelegator implements Runnable {
// start a new member in the same Partition
String partitionId = monitor.getPartitonOfMember(memberId);
Partition partition = monitor.getDeploymentPolicy().getPartitionById(partitionId);
- ccClient.spawnAnInstance(partition, clusterId);
+ ccClient.spawnAnInstance(partition, clusterId, null);
if (log.isInfoEnabled()) {
log.info(String.format("Instance spawned for fault member: [partition] %s [cluster] %s", partitionId, clusterId));
}
[2/2] git commit: fixing a build issue
Posted by ni...@apache.org.
fixing a build issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7732f135
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7732f135
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7732f135
Branch: refs/heads/master
Commit: 7732f135088ff932c83197e0b20f6e40af1e401e
Parents: 34d0469
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Dec 11 23:34:30 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Dec 11 23:40:13 2013 +0530
----------------------------------------------------------------------
.../autoscaler/partition/PartitionManager.java | 4 --
.../rule/AutoscalerRuleEvaluator.java | 52 +++++++++++---------
2 files changed, 29 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7732f135/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java
index cd40618..90d6113 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java
@@ -188,8 +188,4 @@ private static final Log log = LogFactory.getLog(PartitionManager.class);
}
}
- public NetworkPartitionContext getNetworkPartition(String partitionGroupId) {
- return networkPartitionContexts.get(partitionGroupId);
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7732f135/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
index 670d1d6..3ec7adb 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
@@ -125,29 +125,35 @@ public class AutoscalerRuleEvaluator {
}
public void delegateSpawn(PartitionContext partitionContext, String clusterId) {
- try {
-
- String nwPartitionId = partitionContext.getNetworkPartitionId();
- NetworkPartitionContext ctxt = PartitionManager.getInstance().getNetworkPartition(nwPartitionId);
-
- Properties props = partitionContext.getProperties();
- String value = (String) props.get(org.apache.stratos.messaging.util.Constants.LOAD_BALANCER_REF);
- String lbClusterId;
-
- if(value.equals(org.apache.stratos.messaging.util.Constants.DEFAULT_LOAD_BALANCER)) {
- lbClusterId = ctxt.getDefaultLbClusterId();
- } else if(value.equals(org.apache.stratos.messaging.util.Constants.SERVICE_AWARE_LOAD_BALANCER)) {
- String serviceName = partitionContext.getServiceName();
- lbClusterId = ctxt.getLBClusterIdOfService(serviceName);
- }
-
- MemberContext memberContext = CloudControllerClient.getInstance()
- .spawnAnInstance(partitionContext.getPartition(), clusterId, lbClusterId);
- if( memberContext!= null){
- partitionContext.addPendingMember(memberContext);
- }
-
- } catch (Throwable e) {
+ try {
+
+ String nwPartitionId = partitionContext.getNetworkPartitionId();
+ NetworkPartitionContext ctxt =
+ PartitionManager.getInstance()
+ .getNetworkPartition(nwPartitionId);
+
+ Properties props = partitionContext.getProperties();
+ String value =
+ (String) props.get(org.apache.stratos.messaging.util.Constants.LOAD_BALANCER_REF);
+ String lbClusterId = null;
+
+ if (value.equals(org.apache.stratos.messaging.util.Constants.DEFAULT_LOAD_BALANCER)) {
+ lbClusterId = ctxt.getDefaultLbClusterId();
+ } else if (value.equals(org.apache.stratos.messaging.util.Constants.SERVICE_AWARE_LOAD_BALANCER)) {
+ String serviceName = partitionContext.getServiceName();
+ lbClusterId = ctxt.getLBClusterIdOfService(serviceName);
+ }
+
+ MemberContext memberContext =
+ CloudControllerClient.getInstance()
+ .spawnAnInstance(partitionContext.getPartition(),
+ clusterId,
+ lbClusterId);
+ if (memberContext != null) {
+ partitionContext.addPendingMember(memberContext);
+ }
+
+ } catch (Throwable e) {
String message = "Cannot spawn an instance";
log.error(message, e);
throw new RuntimeException(message, e);