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 2014/04/10 18:39:50 UTC
[1/2] git commit: making calls to CC synchronized from auto-scaler to
avoid sending multiple simultaneous calls to CC
Repository: incubator-stratos
Updated Branches:
refs/heads/master ad4a8cb5b -> 63ead13e8
making calls to CC synchronized from auto-scaler to avoid sending multiple simultaneous calls to CC
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b2684aa1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b2684aa1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b2684aa1
Branch: refs/heads/master
Commit: b2684aa1035d2a1315f9fecea5c22ba79196a35c
Parents: 5ab1588
Author: Nirmal Fernando <ni...@apache.org>
Authored: Thu Apr 10 22:08:40 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Thu Apr 10 22:08:40 2014 +0530
----------------------------------------------------------------------
.../client/cloud/controller/CloudControllerClient.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b2684aa1/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
index e41348c..ee86c0f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
@@ -126,7 +126,7 @@ public class CloudControllerClient {
}
- public MemberContext spawnAnInstance(Partition partition,
+ public synchronized MemberContext spawnAnInstance(Partition partition,
String clusterId, String lbClusterId, String networkPartitionId) throws SpawningException {
try {
if(log.isInfoEnabled()) {
@@ -162,7 +162,7 @@ public class CloudControllerClient {
}
}
- public void terminateAllInstances(String clusterId) throws TerminationException {
+ public synchronized void terminateAllInstances(String clusterId) throws TerminationException {
try {
if(log.isInfoEnabled()) {
log.info(String.format("Terminating all instances of cluster via cloud controller: [cluster] %s", clusterId));
@@ -185,7 +185,7 @@ public class CloudControllerClient {
}
}
- public void terminate(String memberId) throws TerminationException {
+ public synchronized void terminate(String memberId) throws TerminationException {
try {
if(log.isInfoEnabled()) {
log.info(String.format("Terminating instance via cloud controller: [member] %s", memberId));
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ni...@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/63ead13e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/63ead13e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/63ead13e
Branch: refs/heads/master
Commit: 63ead13e80a5ff708541a371e566fcfc5817cb61
Parents: b2684aa ad4a8cb
Author: Nirmal Fernando <ni...@apache.org>
Authored: Thu Apr 10 22:08:46 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Thu Apr 10 22:08:46 2014 +0530
----------------------------------------------------------------------
tools/stratos-installer/setup.sh | 20 +++++++-------------
tools/stratos-installer/start-servers.sh | 12 ++++--------
2 files changed, 11 insertions(+), 21 deletions(-)
----------------------------------------------------------------------