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 2014/01/13 09:25:20 UTC
[1/2] git commit: Adding pending member while spawning instance on
member fault event
Updated Branches:
refs/heads/master d929b3791 -> 8ef8709a7
Adding pending member while spawning instance on member fault event
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/dcdc412d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dcdc412d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dcdc412d
Branch: refs/heads/master
Commit: dcdc412d2e0be58bbda99fe983902206156df8a5
Parents: 1aded30
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Jan 13 13:59:03 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Jan 13 13:59:03 2014 +0530
----------------------------------------------------------------------
.../message/receiver/health/AutoscalerHealthStatReceiver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/dcdc412d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatReceiver.java
index db71f57..c2f1097 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatReceiver.java
@@ -740,7 +740,7 @@ public class AutoscalerHealthStatReceiver implements Runnable {
PartitionContext partitionCtxt = nwPartitionCtxt.getPartitionCtxt(partitionId);
String lbClusterId = AutoscalerRuleEvaluator.getLbClusterId(partitionCtxt, nwPartitionCtxt);
- ccClient.spawnAnInstance(partition, clusterId, lbClusterId, nwPartitionCtxt.getId());
+ partitionCtxt.addPendingMember(ccClient.spawnAnInstance(partition, clusterId, lbClusterId, nwPartitionCtxt.getId()));
if (log.isInfoEnabled()) {
log.info(String.format("Instance spawned for fault member: [partition] %s [cluster] %s [lb cluster] %s ",
partitionId, clusterId, lbClusterId));
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@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/8ef8709a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8ef8709a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8ef8709a
Branch: refs/heads/master
Commit: 8ef8709a7a8e9e5b5839f202ec47aa7885cc0bba
Parents: dcdc412 d929b37
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Jan 13 13:59:55 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Jan 13 13:59:55 2014 +0530
----------------------------------------------------------------------
.../stratos/cartridge/agent/CartridgeAgent.java | 2 +-
...eCleanupClusterNotifierMessageProcessor.java | 55 ++++++++++++++++++++
...ceCleanupMemberNotifierMessageProcessor.java | 55 ++++++++++++++++++++
...InstanceCleanupNotifierMessageProcessor.java | 55 --------------------
.../InstanceNotifierMessageProcessorChain.java | 14 +++--
.../distribution/src/main/assembly/bin.xml | 1 +
6 files changed, 121 insertions(+), 61 deletions(-)
----------------------------------------------------------------------